From add8ac3d56ca69246b11a3fd1358c2c46dbf25b7 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 25 Jan 2012 12:11:41 +0100 Subject: [PATCH] Require gitlog-to-changelog to be installed. * Makefile.am (GITLOG_TO_CHANGELOG): New. (gen-ChangeLog): Use installed version of gitlog-to-changelog. -- In case an appropriate version of gitlog-to-changelog is not in the PATH, it is possible to override it using something like: make distcheck GITLOG_TO_CHANGELOG=/foo/bar/my-gitlog-to-changelog --- Makefile.am | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 49ec3fc78..6207d7bb9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -22,6 +22,8 @@ ACLOCAL_AMFLAGS = -I m4 -I gl/m4 AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip DISTCHECK_CONFIGURE_FLAGS = --enable-symcryptrun --enable-mailto --enable-gpgtar +GITLOG_TO_CHANGELOG=gitlog-to-changelog + EXTRA_DIST = scripts/config.rpath scripts/potomo autogen.sh README.GIT \ ChangeLog-2011 po/ChangeLog-2011 scripts/ChangeLog-2011 \ scripts/gitlog-to-changelog \ @@ -115,8 +117,7 @@ gen_start_date = 2011-12-01T06:00:00 gen-ChangeLog: if test -d $(top_srcdir)/.git; then \ (cd $(top_srcdir) && \ - ./scripts/gitlog-to-changelog \ - --append-dot --tear-off \ + $(GITLOG_TO_CHANGELOG) --append-dot --tear-off \ --amend=scripts/git-log-fix \ --since=$(gen_start_date) ) > $(distdir)/cl-t; \ cat $(top_srcdir)/scripts/git-log-footer >> $(distdir)/cl-t; \