From d06e9807bc8da31add72653d381361f7284ac677 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Wed, 8 Jul 2009 10:25:14 -0400 Subject: [PATCH] imake: use XORG_CHANGELOG macro to create ChangeLog. #22611 Build break: Makefile.am: command not found: git-log Adding the macro in configure.ac and use it in Makefile.am Refer to: https://bugs.freedesktop.org/show_bug.cgi?id=22611 Tested: running autogen.sh, make and 'make dist' Signed-off-by: Gaetan Nadon --- Makefile.am | 2 +- configure.ac | 5 +++++ 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/Makefile.am b/Makefile.am index 4f52cee..0a42e36 100644 --- a/Makefile.am +++ b/Makefile.am @@ -160,6 +160,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 37c3cc9..d69e4ab 100644 --- a/configure.ac +++ b/configure.ac @@ -28,6 +28,10 @@ AM_MAINTAINER_MODE 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_PROG_CC AC_PROG_INSTALL @@ -127,5 +131,6 @@ AC_SUBST(XPROTO_CFLAGS) XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile]) -- 1.6.0.4