From fa5072d2176d58903bccca6192ce15ad65cdf02f Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Thu, 9 Jul 2009 13:09:42 -0400 Subject: [PATCH] xf86-video-mga: use XORG_CHANGELOG macro to create ChangeLog. #22611 Unlike other modules, git-log was changed to "git log" so build did not break Adding the macro in configure.ac and use it in Makefile.am Refer to: https://bugs.freedesktop.org/show_bug.cgi?id=22611 Signed-off-by: Gaetan Nadon --- Makefile.am | 2 +- configure.ac | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/Makefile.am b/Makefile.am index 44f8234..4fd3261 100644 --- a/Makefile.am +++ b/Makefile.am @@ -27,6 +27,6 @@ EXTRA_DIST = README_HALLIB mga_PInS.txt 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 3a04b21..1067ffe 100644 --- a/configure.ac +++ b/configure.ac @@ -31,6 +31,11 @@ XORG_RELEASE_VERSION AC_CONFIG_SRCDIR([Makefile.am]) AM_CONFIG_HEADER([config.h]) + +# Require xorg-macros: XORG_RELEASE_VERSION 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) + AC_CONFIG_AUX_DIR(.) AM_INIT_AUTOMAKE([dist-bzip2]) @@ -173,6 +178,7 @@ AC_SUBST([DRIVER_NAME]) XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([ Makefile -- 1.6.0.4