diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2009-07-07 17:32:01 -0400 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-07-11 20:33:28 +1000 |
| commit | 4d9e3200b1625ad24053ce5f1ca816a03939c6d5 (patch) | |
| tree | b1b7aed35051306cf4cb3c390923be9b5a459054 | |
| parent | 1fa03c39bddace4d787c55703f3081bcaf36511b (diff) | |
twm: use XORG_CHANGELOG macro to create ChangeLog. #22611
Build break: app/twm/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.am | 2 | ||||
| -rw-r--r-- | configure.ac | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 9d53635..deaa869 100644 --- a/Makefile.am +++ b/Makefile.am @@ -29,6 +29,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 7a514d5..a5e459b 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 AC_PROG_YACC @@ -42,6 +46,7 @@ AC_SUBST(TWM_LIBS) XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile src/Makefile |