summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am13
-rw-r--r--configure.ac2
-rw-r--r--mate-about/Makefile.am10
-rw-r--r--mate-about/mate-version.xml.in.in (renamed from mate-version.xml.in.in)0
4 files changed, 11 insertions, 14 deletions
diff --git a/Makefile.am b/Makefile.am
index 9a9f82a..4cb9c4f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,20 +10,11 @@ DISTCHECK_CONFIGURE_FLAGS = \
--enable-gtk-doc \
CFLAGS='-Wno-deprecated-declarations'
-if MATE_ABOUT_ENABLED
-versiondir = $(datadir)/mate-about
-version_DATA = mate-version.xml
-endif
-
-@INTLTOOL_XML_RULE@
-
EXTRA_DIST = \
autogen.sh \
- COPYING-DOCS \
- mate-version.xml.in.in
+ COPYING-DOCS
-CLEANFILES = \
- $(version_DATA)
+CLEANFILES =
MAINTAINERCLEANFILES = \
$(srcdir)/aclocal.m4 \
diff --git a/configure.ac b/configure.ac
index f616fc4..3d9fd0f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -238,13 +238,13 @@ fi
AC_CONFIG_FILES([
Makefile
mate-about/Makefile
+mate-about/mate-version.xml.in
libmate-desktop/Makefile
libmate-desktop/mate-desktop-2.0.pc
libmate-desktop/mate-desktop-2.0-uninstalled.pc
docs/Makefile
docs/reference/Makefile
docs/reference/mate-desktop/Makefile
-mate-version.xml.in
po/Makefile.in
schemas/Makefile
schemas/org.mate.accessibility-keyboard.gschema.xml
diff --git a/mate-about/Makefile.am b/mate-about/Makefile.am
index 5c07102..7e028e6 100644
--- a/mate-about/Makefile.am
+++ b/mate-about/Makefile.am
@@ -15,9 +15,15 @@ desktopdir = $(datadir)/applications
desktop_in_files = mate-about.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-EXTRA_DIST = $(desktop_in_files)
+versiondir = $(datadir)/mate-about
+version_DATA = mate-version.xml
-CLEANFILES = $(desktop_DATA) $(bin_PROGRAMS)
+@INTLTOOL_XML_RULE@
+
+EXTRA_DIST = $(desktop_in_files) \
+ mate-version.xml.in
+
+CLEANFILES = $(desktop_DATA) $(bin_PROGRAMS) $(version_DATA)
#-include $(top_srcdir)/git.mk
diff --git a/mate-version.xml.in.in b/mate-about/mate-version.xml.in.in
index 524afa8..524afa8 100644
--- a/mate-version.xml.in.in
+++ b/mate-about/mate-version.xml.in.in