From 8813fac09f25114e2d0191b7c5bca50c544bb5a1 Mon Sep 17 00:00:00 2001 From: Zack Weinberg Date: Fri, 21 Jan 2022 14:57:30 -0500 Subject: build: fix ChangeLog generation in external build directory MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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(-) (limited to 'maintainer') 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) -- cgit v1.2.1