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 | e31076f71177062f481b9f83f925e68b608b2ff9 (patch) | |
| tree | 2eff82496e2eb5167cda664d59d4353e8a0b2e45 | |
| parent | caee025000e3e9ea5ca0eb47411ebef9dea8481d (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 xf86miscproto.pc *~ +xf86miscproto-*.tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index 541b39b..f4ffe05 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,7 +6,7 @@ xf86misc_HEADERS = \ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xf86miscproto.pc -EXTRA_DIST = autogen.sh xf86miscproto.pc.in +EXTRA_DIST = xf86miscproto.pc.in EXTRA_DIST += ChangeLog MAINTAINERCLEANFILES = ChangeLog @@ -14,6 +14,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 7bd8bbc..bac1841 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,11 @@ AC_PREREQ([2.57]) AC_INIT([XF86MiscProto], [0.9.2], [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 xf86miscproto.pc]) |