]> git.ipfire.org Git - thirdparty/coreutils.git/commitdiff
maint: don't let envvar setting break ChangeLog generation
authorJim Meyering <meyering@fb.com>
Sat, 3 May 2014 16:23:46 +0000 (09:23 -0700)
committerJim Meyering <meyering@fb.com>
Sat, 3 May 2014 16:31:46 +0000 (09:31 -0700)
* Makefile.am (gen-ChangeLog): Clear amend_git_log when we
don't set it, so that an envvar setting cannot cause trouble.

Makefile.am

index 7eb2d5cbaa65d97b82a0347bceff0214b7ca03dd..e88dc9c02d25388280df1d26fa43eabedc5f8da7 100644 (file)
@@ -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 &&                             \