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 | 905d83be89b54fbe54762f9cba592edf40bd26f9 (patch) | |
| tree | f2b841ca4ff7ea53d66c14d025c16440f478c969 | |
| parent | 5049399e036af4aa6aa7cb9cd02b52da03c3d24d (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 trapproto.pc *~ +trapproto-*.tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index 3fd33be..dbd2c38 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,7 +11,7 @@ trap_HEADERS = \ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = trapproto.pc -EXTRA_DIST = autogen.sh trapproto.pc.in +EXTRA_DIST = trapproto.pc.in EXTRA_DIST += ChangeLog MAINTAINERCLEANFILES = ChangeLog @@ -19,6 +19,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 e85e357..6b9b582 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,11 @@ AC_PREREQ([2.57]) AC_INIT([TrapProto], [3.4.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 trapproto.pc]) |