From bcf8221b56efb9ba3ffd21399d176d809e54136f Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Tue, 7 Jul 2009 17:52:50 -0400 Subject: [PATCH] xev: use XORG_CHANGELOG macro to create ChangeLog. #22611 Build break: app/xev/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 | 3 ++- configure.ac | 5 +++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/Makefile.am b/Makefile.am index 3af1bda..009eec2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -66,5 +66,6 @@ SUFFIXES = .$(APP_MAN_SUFFIX) .man .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 c9e21d3..3ff1144 100644 --- a/configure.ac +++ b/configure.ac @@ -27,6 +27,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 @@ -37,5 +41,6 @@ AC_SUBST(XEV_LIBS) XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile]) -- 1.6.0.4