summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>2009-01-27 20:06:27 -0200
committerPaulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>2009-01-27 20:06:27 -0200
commite0eb5406819da106bd36073584651ebf6e2aa8a9 (patch)
tree201bedd89222d38af508be2ee9147d455fdd315e
parent8f22f7b03787dd948959b53f103307148ce5bee4 (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 e7f1249..b54406e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,6 @@ configure
install-sh
missing
*~
+applewmproto-*.tar.*
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index 3779541..53c0854 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ applewm_HEADERS = \
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = applewmproto.pc
-EXTRA_DIST = autogen.sh applewmproto.pc.in
+EXTRA_DIST = applewmproto.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 7f49868..b111690 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,11 @@ AC_PREREQ([2.57])
AC_INIT([AppleWMProto], [1.1.1], [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
applewmproto.pc])