From 9d29b7d0251167a884f76cdca1bfc32eeefad22a Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Wed, 8 Jul 2009 10:46:21 -0400 Subject: [PATCH] sun-misc: 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 a2db066..12b622b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -56,6 +56,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 ae79149..70a388e 100644 --- a/configure.ac +++ b/configure.ac @@ -26,6 +26,10 @@ AC_INIT(font-sun-misc, [1.0.0], [https://bugs.freedesktop.org/enter_bug.cgi?prod AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE +# 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_INSTALL AC_PATH_PROG(BDFTOPCF, bdftopcf) @@ -48,5 +52,6 @@ AC_ARG_WITH(fontdir, AC_SUBST(FONTDIR) XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile]) -- 1.6.0.4