[automake-commit] branch master updated: build: fix ChangeLog generation in external build directory

[Zack Weinberg]

This is an automated email from the git hooks/post-receive script.

zackw pushed a commit to branch master
in repository automake.

View the commit online:
https://git.savannah.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=8813fac09f25114e2d0191b7c5bca50c544bb5a1

The following commit(s) were added to refs/heads/master by this push:
     new 8813fac09 build: fix ChangeLog generation in external build directory
8813fac09 is described below

commit 8813fac09f25114e2d0191b7c5bca50c544bb5a1
Author: Zack Weinberg <zackw@panix.com>
AuthorDate: Fri Jan 21 14:57:30 2022 -0500

    build: fix ChangeLog generation in external build directory
    
    When gitlog-to-changelog is run in a build directory that is neither the 
same
    as, nor a subdirectory of, the source directory, it needs a --srcdir option 
or
    it will fail to generate the changelog.  For instance
    
    $ git clone https://git.savannah.gnu.org/git/automake.git
    …
    $ (cd automake && ./bootstrap)
    $ mkdir b-automake
    $ cd b-automake
    $ ../automake/configure
    …
    $ make dist
    …
      GEN      ChangeLog
    gitlog-to-changelog:../s-automake/.git-log-fix: unused entry: 
22729165f6bb902daeb8a4d8e7cb06982390f327
    gitlog-to-changelog:../s-automake/.git-log-fix: unused entry: 
3b369e6bbe0fb6d7359398935706c87dd9375cb6
    make[2]: *** [../automake/maintainer/maint.mk:48: ChangeLog] Error 1
    
     * maintainer/maint.mk (gitlog_to_changelog_options): Add --srcdir option.
---
 maintainer/maint.mk | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/maintainer/maint.mk b/maintainer/maint.mk
index d2a17436f..55fa0a4c3 100644
--- a/maintainer/maint.mk
+++ b/maintainer/maint.mk
@@ -27,9 +27,11 @@ WGET = wget
 
 gitlog_to_changelog_command = $(PERL) $(srcdir)/lib/gitlog-to-changelog
 gitlog_to_changelog_fixes = $(srcdir)/.git-log-fix
-gitlog_to_changelog_options = --amend=$(gitlog_to_changelog_fixes) \
-                              --since='2011-12-28 00:00:00' \
-                              --no-cluster --format '%s%n%n%b'
+gitlog_to_changelog_options = \
+  --srcdir=$(srcdir) \
+  --amend=$(gitlog_to_changelog_fixes) \
+  --since='2011-12-28 00:00:00' \
+  --no-cluster --format '%s%n%n%b'
 
 EXTRA_DIST += lib/gitlog-to-changelog
 EXTRA_DIST += $(gitlog_to_changelog_fixes)