diff options
| author | Marty E. Plummer <[email protected]> | 2019-03-24 20:20:45 -0500 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2019-04-04 17:17:33 +0200 |
| commit | cef021e238d276a7d79e37408a9f3f702f6a6a83 (patch) | |
| tree | 945283a4678fb2fc042d8a7f3b77433129ad40d9 | |
| parent | 0357a898432bcbaab75b1a3226255b064d41e249 (diff) | |
| download | mate-desktop-cef021e238d276a7d79e37408a9f3f702f6a6a83.tar.bz2 mate-desktop-cef021e238d276a7d79e37408a9f3f702f6a6a83.tar.xz | |
mate-about: subdir mate-version.xml.in.in
Signed-off-by: Marty E. Plummer <[email protected]>
| -rw-r--r-- | Makefile.am | 13 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | mate-about/Makefile.am | 10 | ||||
| -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 |