summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2013-10-22 08:08:05 -0700
committerStefano Karapetsas <[email protected]>2013-10-22 08:08:05 -0700
commit107af596cce261e6bc9285fffb04d7971975ef3f (patch)
treedbe03eb2f453631e51a55e8a7d705cb026e605c1
parent002703a0f4b6167dd6421c3a0a96795c6386c840 (diff)
parent713fbe7d6df4e0a6ca056c63c1e038a621e8f310 (diff)
downloadmate-polkit-107af596cce261e6bc9285fffb04d7971975ef3f.tar.bz2
mate-polkit-107af596cce261e6bc9285fffb04d7971975ef3f.tar.xz
Merge pull request #8 from infirit/1.6
Add ChangeLog gen dist-hook and small autofoo fixes
-rw-r--r--Makefile.am21
-rw-r--r--configure.ac3
2 files changed, 21 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index a5ae081..6f58f0f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,9 +1,26 @@
SUBDIRS = polkitgtkmate src po docs
EXTRA_DIST = \
- autogen.sh \
- TODO \
HACKING
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+
clean-local :
rm -f *~ po/*~
+
+dist-hook:
+ @if test -d "$(srcdir)/.git"; \
+ then \
+ echo Creating ChangeLog && \
+ ( cd "$(top_srcdir)" && \
+ echo '# Generated by Makefile. Do not edit.'; echo; \
+ $(top_srcdir)/missing --run git log --stat ) > ChangeLog.tmp \
+ && mv -f ChangeLog.tmp $(distdir)/ChangeLog \
+ || ( rm -f ChangeLog.tmp ; \
+ echo Failed to generate ChangeLog >&2 ); \
+ else \
+ echo A git clone is required to generate a ChangeLog >&2; \
+ fi
+
diff --git a/configure.ac b/configure.ac
index 6224320..dee3a67 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,10 @@
-AC_INIT([polkit-mate],[1.6.0],[http://www.mate-desktop.org/],[polkit-mate])
+AC_INIT([polkit-mate],[1.6.0],[http://www.mate-desktop.org/],[mate-polkit])
AM_INIT_AUTOMAKE([1.9 foreign dist-bzip2 no-dist-gzip])
AC_CONFIG_SRCDIR([src])
AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_MACRO_DIR([m4])
AM_MAINTAINER_MODE