From ce2bfafb0932885b8e8410fc2bd0d2036867bb32 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Fri, 8 Nov 2019 19:18:31 +0100
Subject: [PATCH] build: bootstrap fixes.

* build-aux/config.sh.in (bootstrap): Set up for substitution.
* configure.sh (bootstrap): Substitute.
* build-aux/install.sh.in (_v): Robustify check for V.
(__exclude_go, __exclude_scm): Initialize.
---
 build-aux/config.sh.in  |  2 +-
 build-aux/install.sh.in | 10 +++++++---
 configure.sh            |  1 +
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/build-aux/config.sh.in b/build-aux/config.sh.in
index 80a8df01..83fa015d 100644
--- a/build-aux/config.sh.in
+++ b/build-aux/config.sh.in
@@ -52,7 +52,7 @@ arch="@arch@"
 build="@build@"
 host="@host@"
 
-bootstrap=${bootstrap-}
+bootstrap=${bootstrap-@bootstrap@}
 compiler=${compiler-@compiler@}
 courageous=${courageous-@courageous@}
 mes_system=@mes_system@
diff --git a/build-aux/install.sh.in b/build-aux/install.sh.in
index 042e45f4..a78ed292 100644
--- a/build-aux/install.sh.in
+++ b/build-aux/install.sh.in
@@ -27,9 +27,11 @@ _v=
 if test "$V" = 2; then
     set -x
 fi
-if test "$V" -gt 0; then
-    v=v
-    _v=-v
+if test -n "$V"; then
+    if test "$V" -gt 0; then
+        v=v
+        _v=-v
+    fi
 fi
 
 set -u
@@ -77,6 +79,8 @@ else
     cp $_v ChangeLog ${DESTDIR}${docdir}
 fi
 
+__exclude_go=
+__exclude_scm=
 if test -f module/mescc.go; then
     __exclude_go=--exclude='*.go'
     __exclude_scm=--exclude='*.scm'
diff --git a/configure.sh b/configure.sh
index 6f167bea..ca0677ab 100755
--- a/configure.sh
+++ b/configure.sh
@@ -110,6 +110,7 @@ subst () {
     -e s,"@PACKAGE_NAME@,$PACKAGE_NAME,"\
     -e s,"@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,"\
     -e s,"@VERSION@,$VERSION,"\
+    -e s,"@bootstrap@,yes,"\
     -e s,"@build@,$build,"\
     -e s,"@host@,$host,"\
     -e s,"@compiler@,$compiler,"\