diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2009-07-08 09:58:43 -0400 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-07-11 20:48:32 +1000 |
| commit | 15b83219b51deb2f87f4d2be4a8ac14f15ffbde2 (patch) | |
| tree | 9d52c377b942a0006adaf6e9c61498dce50ad569 | |
| parent | ad757e0c29f7e826f48b60df2d5b8b436d243449 (diff) | |
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 <memsize@videotron.ca>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | Makefile.am | 7 | ||||
| -rw-r--r-- | 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 |