From 234a598e41331bb29c10b77ac747e3009be37d27 Mon Sep 17 00:00:00 2001
From: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Tue, 27 Jan 2009 15:23:52 -0200
Subject: Correct make distcheck.

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

diff --git a/.gitignore b/.gitignore
index 8d7c959..160e62d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,17 @@
+Makefile
 Makefile.in
 aclocal.m4
 autom4te.cache
+config.h
 config.h.in
+config.log
+config.status
 configure
 install-sh
 missing
+stamp-h1
 *~
+xbitmaps-*.tar.*
+xbitmaps.pc
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index 293bc51..4c2f01a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -85,6 +85,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 5d95d99..0716aed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,13 +1,16 @@
-# $XdotOrg: $
-
 AC_PREREQ([2.57])
 AC_INIT(xbitmaps, [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xbitmaps)
 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE
 
+# 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)
+
 AM_CONFIG_HEADER(config.h)
 
 XORG_RELEASE_VERSION
+XORG_CHANGELOG
 
 AC_OUTPUT([
 	Makefile
-- 
cgit v1.2.3