diff options
| author | Stefano Karapetsas <[email protected]> | 2013-07-22 14:47:29 +0200 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2013-07-22 14:47:29 +0200 |
| commit | a6896713292f6a101f4185f5de2a71259e09cb56 (patch) | |
| tree | 849e570c29cafe2e843491540d5004580111fe7b | |
| parent | cd301edb4e03657a0c42140bd03f92a6463939f5 (diff) | |
| download | mozo-a6896713292f6a101f4185f5de2a71259e09cb56.tar.bz2 mozo-a6896713292f6a101f4185f5de2a71259e09cb56.tar.xz | |
Fixes for make dist and make distcheck
| -rw-r--r-- | Makefile.am | 25 | ||||
| -rw-r--r-- | configure.ac | 4 |
2 files changed, 13 insertions, 16 deletions
diff --git a/Makefile.am b/Makefile.am index 357ee37..c1a6956 100644 --- a/Makefile.am +++ b/Makefile.am @@ -16,23 +16,20 @@ mozo: mozo.in mozo: Makefile EXTRA_DIST = \ - mozo.in \ - MAINTAINERS \ - ChangeLog.pre-git + mozo.in ChangeLog: - @echo Creating $@ - @if test -d "$(srcdir)/.git"; then \ - (GIT_DIR=$(top_srcdir)/.git ./missing --run git log git-migration.. --stat -M -C --name-status --date=short --no-color) | fmt --split-only > [email protected] \ - && mv -f [email protected] $@ \ - || ($(RM) [email protected]; \ - echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \ - (test -f $@ || echo git-log is required to generate this file >> $@)); \ + @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 \ - test -f $@ || \ - (echo A git checkout and git-log is required to generate ChangeLog >&2 && \ - echo A git checkout and git-log is required to generate this file >> $@); \ + echo A git clone is required to generate a ChangeLog >&2; \ fi .PHONY: ChangeLog - diff --git a/configure.ac b/configure.ac index 1b187c5..416c1c4 100644 --- a/configure.ac +++ b/configure.ac @@ -1,10 +1,10 @@ dnl -*- Mode: autoconf -*- dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.53) -AC_INIT(mozo, 1.6.0, http://www.mate-desktop.org) +AC_INIT(mate-menu-editor, 1.6.0, http://www.mate-desktop.org) AC_CONFIG_SRCDIR(mozo.in) AC_CONFIG_HEADERS([config.h]) -AM_INIT_AUTOMAKE([1.7]) +AM_INIT_AUTOMAKE([1.7 dist-xz no-dist-gzip]) AM_MAINTAINER_MODE m4_define(required_pygobject_version, 2.15.1) |