diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-27 20:06:28 -0200 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-27 20:06:28 -0200 |
| commit | e5baafc41e4d3419e2e26bb4c8283febddc0b3c7 (patch) | |
| tree | 0aedb16828802c3a5118ebedc70e5e9c740cd551 | |
| parent | f911b95b9451bbdcb8fb83952c6c554d8c48a34a (diff) | |
Janitor: Correct make distcheck and dont distribute autogen.sh
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 4 |
3 files changed, 9 insertions, 2 deletions
@@ -9,3 +9,6 @@ install-sh missing xf86driproto.pc *~ +xf86driproto-*.tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index 8ef4eca..67222ab 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,7 +4,7 @@ xf86dri_HEADERS = xf86dri.h xf86dristr.h pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xf86driproto.pc -EXTRA_DIST = autogen.sh xf86driproto.pc.in +EXTRA_DIST = xf86driproto.pc.in EXTRA_DIST += ChangeLog MAINTAINERCLEANFILES = ChangeLog @@ -12,6 +12,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 2c9fcd0..814a5ab 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,11 @@ AC_PREREQ([2.57]) AC_INIT([XF86DRIProto], [2.0.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) +# 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) XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile xf86driproto.pc]) |