diff options
| author | Stefano Karapetsas <[email protected]> | 2013-11-10 08:44:18 -0800 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2013-11-10 08:44:18 -0800 |
| commit | 2bc9b44ea369a6b9643b2d6a2d343fcc6aef0d9e (patch) | |
| tree | 04bacae87a4593f24c5475fc0c6fbffbe6549a7e | |
| parent | 5c80c5dd87d8ed92c1c95b38c68b9822b6cb91e7 (diff) | |
| parent | 548b7963c1966991033c2952521e7ac6901d0e62 (diff) | |
| download | mate-utils-2bc9b44ea369a6b9643b2d6a2d343fcc6aef0d9e.tar.bz2 mate-utils-2bc9b44ea369a6b9643b2d6a2d343fcc6aef0d9e.tar.xz | |
Merge pull request #49 from infirit/1.6
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 1d402595..ee79cfdd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -47,14 +47,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 0c0f8120..d63bdbec 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 |