From 89b2ecdde19553295888a173eeff8085e206bcda Mon Sep 17 00:00:00 2001 From: John Darrington Date: Wed, 9 Dec 2015 07:47:18 +0100 Subject: [PATCH] Fix generate-changelog rule when building from outside of the source repository The "make dist" target depends upon a phony target "generate-changelog" which generates the ChangeLog file. Unfortunately, this was failing if the current directory was not the source directory. Worse, this failure was not detected, but would erroneously generate an empty ChangeLog. This change fixes both these problems. --- Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index c475469d09..106c08fd0e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -58,8 +58,8 @@ noinst_HEADERS = $(EXTRA_DIST) generate-changelog: if test -d $(top_srcdir)/.git; then \ - $(top_srcdir)/build-aux/gitlog-to-changelog --since=2008-07-27 \ - > $(distdir)/cl-t; \ + $(top_srcdir)/build-aux/gitlog-to-changelog --since=2008-07-27 --srcdir=$(top_srcdir) \ + > $(distdir)/cl-t || exit 1; \ rm -f $(distdir)/ChangeLog; \ mv $(distdir)/cl-t $(distdir)/ChangeLog; \ fi -- 2.30.2