From 73c3583b1660690e492b046a0753e270aebc6a85 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Wed, 8 Jul 2009 09:58:43 -0400 Subject: [PATCH] wsfb: 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 Signed-off-by: Gaetan Nadon --- Makefile.am | 7 +------ configure.ac | 6 ++++++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Makefile.am b/Makefile.am index bfcf68d..f98b82e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,12 +24,7 @@ SUBDIRS = src 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 a0882e9..fcb460d 100644 --- a/configure.ac +++ b/configure.ac @@ -28,6 +28,11 @@ AC_INIT([xf86-video-wsfb], 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]) @@ -76,6 +81,7 @@ AC_SUBST([DRIVER_NAME]) XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([ Makefile -- 1.6.0.4