From 8d0f35f78c2e66d06899fe0f03f66275b20d5c42 Mon Sep 17 00:00:00 2001
From: infirit <infirit@gmail.com>
Date: Fri, 8 Nov 2013 22:27:25 +0100
Subject: Silence autofoo warnings

---
 Makefile.am  | 2 ++
 configure.ac | 1 +
 2 files changed, 3 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index ab70e1b..075a7d7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,6 +4,8 @@ SUBDIRS = pixmaps po src help
 
 man_MANS = mate-system-monitor.1
 
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
 EXTRA_DIST = \
 	$(man_MANS) \
 	mate-doc-utils.make \
diff --git a/configure.ac b/configure.ac
index 1089a15..4ddd66a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,6 +6,7 @@ AC_INIT([mate-system-monitor], [1.6.1],
         [http://www.mate-desktop.org/])
 AC_CONFIG_SRCDIR(configure.ac)
 AC_CONFIG_HEADERS(config.h)
+AC_CONFIG_MACRO_DIR([m4])
 
 AM_INIT_AUTOMAKE([dist-xz])
 AC_SUBST(ACLOCAL_AMFLAGS, [\${ACLOCAL_FLAGS}])
-- 
cgit v1.2.1


From 9630a64882ae8f9ad8283ab5d736382e4e6a2a38 Mon Sep 17 00:00:00 2001
From: infirit <infirit@gmail.com>
Date: Fri, 8 Nov 2013 22:29:29 +0100
Subject: Only create a tar.xz file

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 4ddd66a..b37fa6f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,7 +8,7 @@ AC_CONFIG_SRCDIR(configure.ac)
 AC_CONFIG_HEADERS(config.h)
 AC_CONFIG_MACRO_DIR([m4])
 
-AM_INIT_AUTOMAKE([dist-xz])
+AM_INIT_AUTOMAKE([no-dist-gzip dist-xz])
 AC_SUBST(ACLOCAL_AMFLAGS, [\${ACLOCAL_FLAGS}])
 
 AM_PROG_LIBTOOL
-- 
cgit v1.2.1


From 57285b6cd5a8688a8d3ac79feabb3fa54ee1d17f Mon Sep 17 00:00:00 2001
From: infirit <infirit@gmail.com>
Date: Fri, 8 Nov 2013 22:36:10 +0100
Subject: Add dist-hook for Changelog creation

---
 Makefile.am | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index 075a7d7..a22fccb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,3 +30,17 @@ DISTCLEANFILES = \
   mate-system-monitor.desktop
 
 DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper
+
+dist-hook:
+	@if test -d "$(srcdir)/.git"; \
+	then \
+		echo Creating ChangeLog && \
+		(GIT_DIR=$(top_srcdir)/.git \
+		 ./missing --run git log --stat -M -C --name-status --date=short --no-color) | \
+		 fmt --split-only > ChangeLog.tmp \
+		&& mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \
+		|| ( rm -f ChangeLog.tmp ; \
+		echo Failed to generate ChangeLog >&2 ); \
+	else \
+		echo A git clone is required to generate a ChangeLog >&2; \
+	fi
-- 
cgit v1.2.1