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.

diff --git a/maintainer/maint.mk b/maintainer/maint.mk
index d2a17436fdb0c07d2d9c991ef40a7f0630a65271..55fa0a4c30675800fc22a4708a3ed02e52d2d7e3 100644 (file)
--- 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)