[Nmh-commits] [SCM] The nmh Mail Handling System branch, master, updated. 8a5ee47c4884d56e13a50c4d28d22559101e1510

[David Levine]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The nmh Mail Handling System".

The branch, master has been updated
       via  8a5ee47c4884d56e13a50c4d28d22559101e1510 (commit)
       via  abf5b4fce854b5ffbced1c1fdec6f42bca53055e (commit)
      from  c8206d4f567151065bc8d896bbd6273bf12dbae3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/nmh.git/commit/?id=8a5ee47c4884d56e13a50c4d28d22559101e1510


commit 8a5ee47c4884d56e13a50c4d28d22559101e1510
Merge: abf5b4f c8206d4
Author: David Levine <address@hidden>
Date:   Sat Jan 28 14:12:05 2012 -0600

    Merge branch 'master' of git.sv.nongnu.org:/srv/git/nmh


http://git.savannah.gnu.org/cgit/nmh.git/commit/?id=abf5b4fce854b5ffbced1c1fdec6f42bca53055e


commit abf5b4fce854b5ffbced1c1fdec6f42bca53055e
Author: David Levine <address@hidden>
Date:   Sat Jan 28 13:52:59 2012 -0600

    Made ChangeLog target phony so it will always get regenerated.  But don't 
try to regenerate if git repository is not present.

diff --git a/Makefile.am b/Makefile.am
index 1a93d89..cd3c886 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -486,8 +486,12 @@ man/man.sed: Makefile
 
 ## Don't include commit hashes in ChangeLog.
 ChangeLog:
-       @git --no-pager log --abbrev-commit | \
-           egrep -v '^commit [0-9a-f]+$$' > $@
+       @[ -d .git ]  &&  git --no-pager log --abbrev-commit | \
+           egrep -v '^commit [0-9a-f]+$$' > $@  ||  true
+## Make ChangeLog phony so it will always get regenerated.  But don't
+## fail if we don't have a git repository in order to allow
+## regeneration of distribution archive or RPM.
+.PHONY: ChangeLog
 
 ##
 ## Our RPM build target

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
The nmh Mail Handling System