[PATCH 04/10] xf86-input-acecad: Use XORG_CHANGELOG to generate ChangeLog.

Paulo Cesar Pereira de Andrade pcpa at mandriva.com.br
Fri Feb 13 10:02:30 PST 2009


  It is preferably to use a macro then change all packages if for some
reason requiment for changes happens again. It is currently required
due to change from "git-log" to "git log".

Signed-off-by: Paulo Cesar Pereira de Andrade <pcpa at mandriva.com.br>
---
 Makefile.am  |    4 ++--
 configure.ac |    5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index ab31815..2c2cd08 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,11 +23,11 @@ SUBDIRS = src man
 
 EXTRA_DIST = ChangeLog
 
-CLEANFILES = ChangeLog
+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 392921e..f5c1e7e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,6 +42,10 @@ AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
 AC_PROG_CC
 
+# 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)
+
 AH_TOP([#include "xorg-server.h"])
 
 #AC_DEFINE(XFree86LOADER,1,[Stub define for loadable drivers])
@@ -96,5 +100,6 @@ AM_CONDITIONAL(HAVE_LIBSYSFS, test x$HAVE_LIBSYSFS = xyes)
 
 XORG_MANPAGE_SECTIONS
 XORG_RELEASE_VERSION
+XORG_CHANGELOG
 
 AC_OUTPUT([Makefile src/Makefile man/Makefile])
-- 
1.6.1.3



More information about the xorg-devel mailing list