rw.rs ~charadon -- gnu-hello

gnu-hello

Info

Commit...:	bb6cd30c16dc4b37107cc1685a4dab979da96f51
Author...:	Jim Meyering
Committer:	Sami Kerola
Date.....:	Sat May 3 09:23:46 2014 -0700
Parents..:	5b5ad49431c7bb651a9815f5bda6d2a239f19f98

Message

maint: don't let envvar setting break ChangeLog generation

* Makefile.am (gen-ChangeLog): Clear amend_git_log when we
don't set it, so that an envvar setting cannot cause trouble.

Changes

diff --git a/Makefile.am b/Makefile.am
line changes: +3/-1
index 5fc61c5..44957a4
--- a/Makefile.am
+++ b/Makefile.am

@@ -135,7 +135,9 @@ gen_start_date = 2011-12-17
 gen-ChangeLog:
 	$(AM_V_GEN)if test -d .git; then				\
 	  log_fix="$(srcdir)/build-aux/git-log-fix";			\
-	  test -e "$$log_fix" && amend_git_log="--amend=$$log_fix";	\
+	  test -e "$$log_fix"						\
+	    && amend_git_log="--amend=$$log_fix"			\
+	    || amend_git_log=;						\
 	  $(top_srcdir)/build-aux/gitlog-to-changelog			\
 	    $$amend_git_log --since=$(gen_start_date) > $(distdir)/cl-t && \
 	    { rm -f $(distdir)/ChangeLog &&				\