From 613bd96abe3eef1279be1bfa731aabe17b6f6e7c Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 21 Jul 2019 17:13:39 +0200 Subject: [PATCH] build: Do not generate ChangeLog from tarball. * configure (main): Set .git-for-build. * build-aux/install.sh.in (DESTDIR): Use it as canary to skip ChangeLog rebuild. --- build-aux/install.sh.in | 2 +- configure | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/build-aux/install.sh.in b/build-aux/install.sh.in index ef686d84..508434e2 100644 --- a/build-aux/install.sh.in +++ b/build-aux/install.sh.in @@ -56,7 +56,7 @@ mkdir -p ${DESTDIR}${docdir} if test -n "${PERL}"\ && test -n "${GIT}"\ && ${PERL} -v > /dev/null\ - && ${GIT} status > /dev/null; then + && ! test -f .git-for-build; then ${PERL} ${srcdest}build-aux/gitlog-to-changelog --srcdir=. > ChangeLog+ fi diff --git a/configure b/configure index 473622b8..81f602b4 100755 --- a/configure +++ b/configure @@ -541,6 +541,7 @@ See \"Porting GNU Mes\" in the manual, or try --with-courage\n" mes-system) ;; Debian wants to run `make clean' from a tarball (and (zero? (system* "git" "init")) (zero? (system* "git" "add" ".")) + (zero? (system* "touch" ".git-for-build")) (zero? (system* "git" "commit" "--allow-empty" "-m" "Import mes"))))) (let ((pairs `(("@PACKAGE@" . ,PACKAGE)