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 | 391f302a7d71b9169ce4c18794251ea3ccc95904 (patch) | |
| tree | 4affb324511a257d82de5b0829301c32ff5f7742 | |
| parent | 1e33337d4dd151da4f0898a86608a1ee67588163 (diff) | |
Janitor: Correct make distcheck and dont distribute autogen.sh
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rwxr-xr-x | configure.ac | 5 |
3 files changed, 10 insertions, 2 deletions
@@ -17,3 +17,6 @@ stamp-h1 stamp-h2 xproto.pc *~ +xproto-*.tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index 533d281..96c6b26 100644 --- a/Makefile.am +++ b/Makefile.am @@ -32,14 +32,14 @@ nodist_xproto_HEADERS = \ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xproto.pc -EXTRA_DIST = autogen.sh xproto.pc.in ChangeLog +EXTRA_DIST = xproto.pc.in ChangeLog CLEANFILES=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 5bcf3ef..d958ffc 100755 --- a/configure.ac +++ b/configure.ac @@ -5,6 +5,10 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2]) AC_CONFIG_HEADER([do-not-use-config.h]) AC_CONFIG_HEADER([Xfuncproto.h]) +# 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_CANONICAL_HOST m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) @@ -197,6 +201,7 @@ if test "x$WIDEPROTO" = xno; then fi XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile Xpoll.h |