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 | 1c7e20d115bc470479f32afd703ca7966754c54f (patch) | |
| tree | d23311951bda1d17c26fcc385ba52cf357dc385d | |
| parent | 1ff5e2cdfa2636317099a0917c9819ff4a81b025 (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 @@ configure install-sh missing randrproto.pc +randrproto-*.tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index 59e0378..ec0cf19 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,7 +9,7 @@ pkgconfig_DATA = randrproto.pc randrdocdir = $(datadir)/doc/$(PACKAGE) randrdoc_DATA = randrproto.txt -EXTRA_DIST = autogen.sh randrproto.pc.in $(randrdoc_DATA) +EXTRA_DIST = randrproto.pc.in $(randrdoc_DATA) EXTRA_DIST += ChangeLog MAINTAINERCLEANFILES = ChangeLog @@ -17,6 +17,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 5c0cc88..4707389 100644 --- a/configure.ac +++ b/configure.ac @@ -25,7 +25,11 @@ AC_PREREQ([2.57]) AC_INIT([RandrProto], [1.2.99.3], [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 randrproto.pc]) |