diff options
| author | Stefano Karapetsas <[email protected]> | 2013-11-10 08:44:15 -0800 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2013-11-10 08:44:15 -0800 |
| commit | c854414d81f811bdf2008a8e8ae34abbaf37c5fb (patch) | |
| tree | 9df0577ef5b3be22a7af88849dab4a7707240e95 | |
| parent | ec30a112619905aed3e8f66ecef66f8425b5de62 (diff) | |
| parent | 1b07e31763ba5c726304a58c4207a376a44a93ec (diff) | |
| download | mate-utils-c854414d81f811bdf2008a8e8ae34abbaf37c5fb.tar.bz2 mate-utils-c854414d81f811bdf2008a8e8ae34abbaf37c5fb.tar.xz | |
Merge pull request #48 from infirit/master
Fix changelog gen plus small fix
| -rw-r--r-- | Makefile.am | 9 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index 028c047c..c37e6929 100644 --- a/Makefile.am +++ b/Makefile.am @@ -45,14 +45,13 @@ DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper --enable-gtk-doc dist-hook: @if test -d "$(srcdir)/.git"; \ then \ - from="git-import"; \ echo Creating ChangeLog && \ ( cd "$(top_srcdir)" && \ - echo '# Generate by configure. Do not edit.'; echo; \ - $(top_srcdir)/missing --run git log --stat $$from.. ) > ChangeLog.tmp \ - && mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \ + 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 ); \ + 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 3aa69388..62ed425a 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ AC_INIT([mate-utils], AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADERS([config.h]) -AM_INIT_AUTOMAKE +AM_INIT_AUTOMAKE([dist-xz no-dist-gzip]) MATE_COMMON_INIT |