summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2013-10-22 08:07:58 -0700
committerStefano Karapetsas <[email protected]>2013-10-22 08:07:58 -0700
commitdda2e15997eed6ebca2a7bdca4ce78d21a89f69e (patch)
treed7a1972fab830d6e0bff1f8823737583b7eab481
parent6457ca05c72c2d66c600c5ce56646a5055312b14 (diff)
parent8d0f85d1bfa9ffae119bc94543b2ca6dce6a17ba (diff)
downloadmate-polkit-dda2e15997eed6ebca2a7bdca4ce78d21a89f69e.tar.bz2
mate-polkit-dda2e15997eed6ebca2a7bdca4ce78d21a89f69e.tar.xz
Merge pull request #9 from infirit/master
Add ChangeLog gen dist-hook and small autofoo fixes
-rw-r--r--Makefile.am19
-rw-r--r--configure.ac1
2 files changed, 20 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index 718432e..6f58f0f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,5 +3,24 @@ SUBDIRS = polkitgtkmate src po docs
EXTRA_DIST = \
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 34b427b..c48e07a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,6 +4,7 @@ AM_INIT_AUTOMAKE([1.9 foreign dist-xz no-dist-gzip])
AC_CONFIG_SRCDIR([src])
AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_MACRO_DIR([m4])
AM_MAINTAINER_MODE