summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaetan Nadon <memsize@videotron.ca>2009-07-07 21:52:50 (GMT)
committerSung-Jin Park <sj76.park@samsung.com>2013-09-03 03:32:30 (GMT)
commit5fba7c2c58cab9914b1d7069d7f4a18b338bfac4 (patch)
tree9dde751e01a74407abf0131e680f7755cd4d516f
parent58504d81f7e7fb91ccc185d3f20b04e4090ae2e8 (diff)
downloadxev-5fba7c2c58cab9914b1d7069d7f4a18b338bfac4.zip
xev-5fba7c2c58cab9914b1d7069d7f4a18b338bfac4.tar.gz
xev-5fba7c2c58cab9914b1d7069d7f4a18b338bfac4.tar.bz2
xev: use XORG_CHANGELOG macro to create ChangeLog. #22611refs/changes/78/9178/1
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' Change-Id: I27e4fc8154e2a19bf235d0b5e2f52cf6410e4c1d Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--Makefile.am3
-rw-r--r--configure.ac5
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])