From cef021e238d276a7d79e37408a9f3f702f6a6a83 Mon Sep 17 00:00:00 2001
From: "Marty E. Plummer" <hanetzer@startmail.com>
Date: Sun, 24 Mar 2019 20:20:45 -0500
Subject: mate-about: subdir mate-version.xml.in.in

Signed-off-by: Marty E. Plummer <hanetzer@startmail.com>
---
 Makefile.am                       | 13 ++-----------
 configure.ac                      |  2 +-
 mate-about/Makefile.am            | 10 ++++++++--
 mate-about/mate-version.xml.in.in |  7 +++++++
 mate-version.xml.in.in            |  7 -------
 5 files changed, 18 insertions(+), 21 deletions(-)
 create mode 100644 mate-about/mate-version.xml.in.in
 delete mode 100644 mate-version.xml.in.in

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-about/mate-version.xml.in.in b/mate-about/mate-version.xml.in.in
new file mode 100644
index 0000000..524afa8
--- /dev/null
+++ b/mate-about/mate-version.xml.in.in
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<mate-version>
+  <platform>@MATE_PLATFORM@</platform>
+  <minor>@MATE_MINOR@</minor>
+  <micro>@MATE_MICRO@</micro>
+  @MATE_DATE_COMMENT_START@<date>@MATE_DATE@</date>@MATE_DATE_COMMENT_END@
+</mate-version>
diff --git a/mate-version.xml.in.in b/mate-version.xml.in.in
deleted file mode 100644
index 524afa8..0000000
--- a/mate-version.xml.in.in
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<mate-version>
-  <platform>@MATE_PLATFORM@</platform>
-  <minor>@MATE_MINOR@</minor>
-  <micro>@MATE_MICRO@</micro>
-  @MATE_DATE_COMMENT_START@<date>@MATE_DATE@</date>@MATE_DATE_COMMENT_END@
-</mate-version>
-- 
cgit v1.2.1