diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-16 20:11:47 -0200 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-16 20:11:47 -0200 |
| commit | 5cff04431124e447f3499850924601ae28d4fceb (patch) | |
| tree | 2a7fe2dd0c8cb69a578aef459f87f6fcb3181f0f | |
| parent | ae3643d936ae4eed9d0b1dfa60fe83718a9987e8 (diff) | |
Use XORG_CHANGELOG to correct "make distcheck"
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 5 |
3 files changed, 9 insertions, 1 deletions
@@ -18,3 +18,6 @@ mkfontdir mkfontdir.1 stamp-h1 *~ +mkfontdir-*.tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index 6b0bd3a..a80667f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -66,6 +66,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 e06cce9..b38989a 100644 --- a/configure.ac +++ b/configure.ac @@ -25,6 +25,10 @@ AC_INIT(mkfontdir, [1.0.4], [https://bugs.freedesktop.org/enter_bug.cgi?product= AM_INIT_AUTOMAKE([dist-bzip2 foreign]) AM_MAINTAINER_MODE +# Require xorg-macros: 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(SED, sed) @@ -32,5 +36,6 @@ AC_SUBST([bindir]) XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile]) |