diff options
| author | Guillem Jover <guillem@hadrons.org> | 2009-02-25 01:17:52 +0200 |
|---|---|---|
| committer | Guillem Jover <guillem@hadrons.org> | 2009-02-25 01:17:52 +0200 |
| commit | 542f21b2465c80d78aa154fa75d61c793342f3d8 (patch) | |
| tree | a35aced68628f3e2f8256730b8ba2805e431d750 | |
| parent | 65c779a41c3ae1c66b7de2ecbd5904a25009f5ca (diff) | |
Use XORG_CHANGELOG and CHANGELOG_CMD to generate the ChangeLog file
Require at least xorg-macros 1.2 for XORG_CHANGELOG.
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | configure.ac | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index edff7fa..95892da 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,10 +26,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 f6a5e55..c6fedd8 100644 --- a/configure.ac +++ b/configure.ac @@ -35,6 +35,11 @@ AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE +# Require xorg-macros version 1.2.0 or newer for 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) + # Checks for programs. AC_DISABLE_STATIC AC_PROG_LIBTOOL @@ -81,6 +86,7 @@ AC_SUBST([DRIVER_NAME]) XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([ Makefile |