diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2008-12-01 13:58:31 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2008-12-01 13:58:31 -0800 |
| commit | 9f12a154437554938a4fa18b7d3948c7dff8d631 (patch) | |
| tree | d887f0dc92f906691ecea2a61caffc08520d90ae | |
| parent | 8c313881a0c586179c09922a7e00a1f8d669a68a (diff) | |
Switch ChangeLog generation to use XORG_CHANGELOG from xorg-macros 1.2
| -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 39b67d3..07e0153 100644 --- a/Makefile.am +++ b/Makefile.am @@ -22,6 +22,6 @@ CLEANFILES = 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 19b736f..dff9d46 100644 --- a/configure.ac +++ b/configure.ac @@ -25,6 +25,10 @@ AC_INIT(xtrans, 1.2.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE +# Require xorg-macros version 1.2.0 or newer for XORG_CHANGELOG macro +m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.2) + # Because xtrans is included into other modules rather than being linked # with, these defines have to be added to the cflags line @@ -44,6 +48,7 @@ sticky_bit_define="-DHAS_STICKY_DIR_BIT" AC_SUBST(sticky_bit_define) XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile xtrans.pc]) |