From 83974b2814eb18d9c86f41e39dfdafaf39759ced Mon Sep 17 00:00:00 2001
From: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Tue, 27 Jan 2009 20:06:28 -0200
Subject: Janitor: Correct make distcheck and dont distribute autogen.sh

---
 .gitignore   | 3 +++
 Makefile.am  | 4 ++--
 configure.ac | 4 ++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 949541e..dcf80c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,6 @@ install-sh
 missing
 scrnsaverproto.pc
 *~
+scrnsaverproto-*.tar.*
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index fd9cb3f..cb098d1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ scrnsaver_HEADERS = \
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = scrnsaverproto.pc
 
-EXTRA_DIST = autogen.sh scrnsaverproto.pc.in
+EXTRA_DIST = scrnsaverproto.pc.in
 
 EXTRA_DIST += ChangeLog
 MAINTAINERCLEANFILES = ChangeLog
@@ -14,6 +14,6 @@ MAINTAINERCLEANFILES = ChangeLog
 .PHONY: ChangeLog
 
 ChangeLog:
-	(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+	$(CHANGELOG_CMD)
 
 dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index 10d7e1b..0a191f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,11 @@ AC_PREREQ([2.57])
 AC_INIT([ScrnSaverProto], [1.1.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
+# Require xorg-macros: XORG_CHANGELOG
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.2)
 XORG_RELEASE_VERSION
+XORG_CHANGELOG
 
 AC_OUTPUT([Makefile
            scrnsaverproto.pc])
-- 
cgit v1.2.1