diff options
| author | Stefano Karapetsas <[email protected]> | 2013-11-08 18:45:35 -0800 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2013-11-08 18:45:35 -0800 |
| commit | 97e8d5025a4373237366b83406b9d671fccbc556 (patch) | |
| tree | f11875e90226e7172b3ee95ac0670eee5e2c3d4e | |
| parent | 769aa03e4ede6ebf47b920a4d3dcfbc16974cd6a (diff) | |
| parent | 7784304322821afd5b40728c27f40b17fbb330cb (diff) | |
| download | mate-system-monitor-97e8d5025a4373237366b83406b9d671fccbc556.tar.bz2 mate-system-monitor-97e8d5025a4373237366b83406b9d671fccbc556.tar.xz | |
Merge pull request #27 from infirit/master
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 8980d63..6084b1a 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-system-monitor.desktop.in \ @@ -27,3 +29,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 07f7105..39fff86 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 |