From a34ef0bc02fa0b3e295350626beea1330e3241b7 Mon Sep 17 00:00:00 2001 From: raveit65 Date: Sat, 6 Aug 2016 15:02:51 +0200 Subject: screenshot: install both UI files this fixes distcheck with creating mate-utils.pot --- configure.ac | 2 -- mate-screenshot/data/Makefile.am | 8 ++------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index 3f161f34..af693de0 100644 --- a/configure.ac +++ b/configure.ac @@ -92,8 +92,6 @@ esac AC_SUBST(GTK_API_VERSION) AC_SUBST(GTK_REQUIRED) -AM_CONDITIONAL([WITH_GTK3],[test "$with_gtk" = "3.0"]) - # common checks PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED) AC_SUBST(GLIB_CFLAGS) diff --git a/mate-screenshot/data/Makefile.am b/mate-screenshot/data/Makefile.am index ae781d46..3f26d30c 100644 --- a/mate-screenshot/data/Makefile.am +++ b/mate-screenshot/data/Makefile.am @@ -4,13 +4,9 @@ mate_screenshot_DATA = $(mate_screenshot_in_files:.desktop.in=.desktop) @INTLTOOL_DESKTOP_RULE@ man_MANS = mate-screenshot.1 -if WITH_GTK3 uidir = $(datadir)/mate-screenshot -ui_DATA = mate-screenshot-gtk3.ui -else -uidir = $(datadir)/mate-screenshot -ui_DATA = mate-screenshot.ui -endif +ui_DATA = mate-screenshot.ui \ + mate-screenshot-gtk3.ui @INTLTOOL_XML_RULE@ appdatadir = $(datadir)/appdata -- cgit v1.2.1