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.

diff --git a/build-aux/install.sh.in b/build-aux/install.sh.in
index ef686d84055080439270074365632ed11be53b0e..508434e2a5e9258ef38155a83c21b826ec041607 100644 (file)
--- 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\
 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
 
     ${PERL} ${srcdest}build-aux/gitlog-to-changelog --srcdir=. > ChangeLog+
 fi
 

diff --git a/configure b/configure
index 473622b8350c4cfd57326948b7bc106aa4c74074..81f602b4d943596eaf0b511c9b094fe2693f42a0 100755 (executable)
--- 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" "."))
           ;; 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)
                (zero? (system* "git" "commit" "--allow-empty" "-m" "Import mes")))))
 
       (let ((pairs `(("@PACKAGE@" . ,PACKAGE)