diff options
| author | Stefano Karapetsas <[email protected]> | 2013-12-16 13:23:22 -0800 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2013-12-16 13:23:22 -0800 |
| commit | 493f2dc5fc5034e3b314ee9d9ce2a757633d82a5 (patch) | |
| tree | 67f8fc6c771c593f96b2c66ed653febc7c746f23 /Makefile.am | |
| parent | bc54d96523662e4c41ab3bda9885b3d4df518426 (diff) | |
| parent | 72ac788c489c974df04698cb7008ae0ee6a3056d (diff) | |
| download | mate-power-manager-493f2dc5fc5034e3b314ee9d9ce2a757633d82a5.tar.bz2 mate-power-manager-493f2dc5fc5034e3b314ee9d9ce2a757633d82a5.tar.xz | |
Merge pull request #89 from infirit/1.6
Cherrypick usefull commits from master
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 29 |
1 files changed, 11 insertions, 18 deletions
diff --git a/Makefile.am b/Makefile.am index 0691df3..edc59dc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -41,23 +41,16 @@ DISTCHECK_CONFIGURE_FLAGS = \ --disable-applets \ --disable-tests -distclean-local: - if test $(srdcir) = .; then :; else \ - rm -f ChangeLog; \ - fi - -ChangeLog: - @echo Creating $@ - @if test -d "$(srcdir)/.git"; then \ - (GIT_DIR=$(top_srcdir)/.git ./missing --run git log --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 >> $@)); \ +dist-hook: + @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 |