diff options
| author | Stefano Karapetsas <[email protected]> | 2013-11-08 18:45:44 -0800 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2013-11-08 18:45:44 -0800 |
| commit | fef8acca76f2daadebe97bffd306cc434ad8584b (patch) | |
| tree | 4f534c7feb61519a9ede86b8e4b4434c6508c5c9 | |
| parent | 8e517ce5e6e79f325a6d614064708aaa77b42cd2 (diff) | |
| parent | 57285b6cd5a8688a8d3ac79feabb3fa54ee1d17f (diff) | |
| download | mate-system-monitor-fef8acca76f2daadebe97bffd306cc434ad8584b.tar.bz2 mate-system-monitor-fef8acca76f2daadebe97bffd306cc434ad8584b.tar.xz | |
Merge pull request #26 from infirit/1.61.6
Cleanups
| -rw-r--r-- | Makefile.am | 16 | ||||
| -rw-r--r-- | configure.ac | 3 |
2 files changed, 18 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index ab70e1b..a22fccb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,6 +4,8 @@ SUBDIRS = pixmaps po src help man_MANS = mate-system-monitor.1 +ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} + EXTRA_DIST = \ $(man_MANS) \ mate-doc-utils.make \ @@ -28,3 +30,17 @@ DISTCLEANFILES = \ mate-system-monitor.desktop DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper + +dist-hook: + @if test -d "$(srcdir)/.git"; \ + then \ + echo Creating ChangeLog && \ + (GIT_DIR=$(top_srcdir)/.git \ + ./missing --run git log --stat -M -C --name-status --date=short --no-color) | \ + fmt --split-only > ChangeLog.tmp \ + && mv -f ChangeLog.tmp $(top_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 1089a15..b37fa6f 100644 --- a/configure.ac +++ b/configure.ac @@ -6,8 +6,9 @@ AC_INIT([mate-system-monitor], [1.6.1], [http://www.mate-desktop.org/]) AC_CONFIG_SRCDIR(configure.ac) AC_CONFIG_HEADERS(config.h) +AC_CONFIG_MACRO_DIR([m4]) -AM_INIT_AUTOMAKE([dist-xz]) +AM_INIT_AUTOMAKE([no-dist-gzip dist-xz]) AC_SUBST(ACLOCAL_AMFLAGS, [\${ACLOCAL_FLAGS}]) AM_PROG_LIBTOOL |