summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaetan Nadon <memsize@videotron.ca>2009-07-08 10:44:07 -0400
committerPeter Hutterer <peter.hutterer@who-t.net>2009-07-11 20:51:59 +1000
commit922f54b907a25c81acb552bb7040d3e4d17f99fe (patch)
tree977b21285a7d93ca9a64553df158781880796d36
parent2418c897d2263eb4634de3f4fcb2877ab167b52b (diff)
mutt-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 <memsize@videotron.ca> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac5
2 files changed, 6 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 0183c3e..99b5c71 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -59,6 +59,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 c5517e4..8ff8e7a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,6 +26,10 @@ AC_INIT(font-mutt-misc, [1.0.0], [https://bugs.freedesktop.org/enter_bug.cgi?pro
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])