summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>2009-01-27 20:06:28 -0200
committerPaulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>2009-01-27 20:06:28 -0200
commit7b8abe5362d4b3231f6bed9182b33db060492431 (patch)
tree84608fe59915363ad19c62e527201b82d02b1c21
parent1a3f6429362c505c1ab5df5fcc00cb913381c8c0 (diff)
Janitor: Correct make distcheck and dont distribute autogen.sh
-rw-r--r--.gitignore3
-rw-r--r--Makefile.am4
-rw-r--r--configure.ac4
3 files changed, 9 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 56a6724..3873307 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,6 @@ install-sh
missing
printproto.pc
*~
+printproto-*.tar.*
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index 5492c79..15546a5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ print_HEADERS = \
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = printproto.pc
-EXTRA_DIST = autogen.sh printproto.pc.in
+EXTRA_DIST = printproto.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 26d4dbb..29de3e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,11 @@ AC_PREREQ([2.57])
AC_INIT([PrintProto], [1.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
printproto.pc])