summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZack Weinberg <zackw@panix.com>2022-01-21 14:57:30 -0500
committerZack Weinberg <zackw@panix.com>2022-01-21 14:57:30 -0500
commit8813fac09f25114e2d0191b7c5bca50c544bb5a1 (patch)
treeb1f598bcc5cc5777426f732952cf1743697bd120
parent5d02285845acfc20a4900a471c0e7c5e2ff390a0 (diff)
downloadautomake-8813fac09f25114e2d0191b7c5bca50c544bb5a1.tar.gz
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.
-rw-r--r--maintainer/maint.mk8
1 files 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)