diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-27 15:23:52 -0200 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-27 15:23:52 -0200 |
| commit | 234a598e41331bb29c10b77ac747e3009be37d27 (patch) | |
| tree | cec8b89637896bcd7072788029580f4c77506190 | |
| parent | 315699dafe12d8aefe52d230209d07a23ce1dd77 (diff) | |
Correct make distcheck.
| -rw-r--r-- | .gitignore | 9 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 7 |
3 files changed, 15 insertions, 3 deletions
@@ -1,8 +1,17 @@ +Makefile Makefile.in aclocal.m4 autom4te.cache +config.h config.h.in +config.log +config.status configure install-sh missing +stamp-h1 *~ +xbitmaps-*.tar.* +xbitmaps.pc +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index 293bc51..4c2f01a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -85,6 +85,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 5d95d99..0716aed 100644 --- a/configure.ac +++ b/configure.ac @@ -1,13 +1,16 @@ -# $XdotOrg: $ - AC_PREREQ([2.57]) AC_INIT(xbitmaps, [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xbitmaps) AM_INIT_AUTOMAKE([dist-bzip2]) 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) + AM_CONFIG_HEADER(config.h) XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([ Makefile |