From 92bda2727b604e442178e9d79ce133bf3947109d Mon Sep 17 00:00:00 2001
From: Stefano Karapetsas <stefano@karapetsas.com>
Date: Fri, 28 Jun 2013 16:56:43 +0200
Subject: Fixes for make dist

---
 Makefile.am     | 1 -
 configure.ac    | 2 +-
 src/Makefile.am | 8 ++++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 4b3d9c6..ab70e1b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,6 @@ EXTRA_DIST = \
 	$(man_MANS) \
 	mate-doc-utils.make \
 	mate-system-monitor.desktop.in \
-	mate-system-monitor.doap \
 	intltool-extract.in \
 	intltool-merge.in \
 	intltool-update.in \
diff --git a/configure.ac b/configure.ac
index 5f8b1cc..8d10a75 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ AC_INIT([mate-system-monitor], [1.6.0],
 AC_CONFIG_SRCDIR(configure.ac)
 AC_CONFIG_HEADERS(config.h)
 
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([dist-xz])
 AC_SUBST(ACLOCAL_AMFLAGS, [\${ACLOCAL_FLAGS}])
 
 AM_PROG_LIBTOOL
diff --git a/src/Makefile.am b/src/Makefile.am
index 8dd903c..35b3ef5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -62,9 +62,13 @@ convertdir = $(datadir)/MateConf/gsettings
 dist_convert_DATA = mate-system-monitor.convert
 
 dist_noinst_DATA = \
-    $(gsettings_in_file)
+	$(gsettings_in_file)
 
 CLEANFILES = \
-    $(gsettings_SCHEMAS)
+	$(gsettings_SCHEMAS) \
+	$(gsettings_SCHEMAS).in
+
+EXTRA_DIST = \
+	$(gsettings_SCHEMAS).in.in
 
 MAINTAINERCLEANFILES = $(gsettings_SCHEMAS:.xml=.valid)
-- 
cgit v1.2.1