From 7514a315eff27339935ba752524a850a6b14e4e4 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@fb.com>
Date: Sat, 3 May 2014 09:23:46 -0700
Subject: [PATCH] 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.
---
 Makefile.am | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 7eb2d5c..e88dc9c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -106,7 +106,9 @@ gen_start_date = 2008-02-08
 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 &&				\
-- 
2.0.0.rc0.38.g1697bf3