build: bootstrap fixes.
authorJan Nieuwenhuizen <janneke@gnu.org>
Tue, 15 Oct 2019 18:18:31 +0000 (20:18 +0200)
committerJan Nieuwenhuizen <janneke@gnu.org>
Tue, 15 Oct 2019 18:18:31 +0000 (20:18 +0200)
* 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
build-aux/install.sh.in
configure.sh

index 80a8df01ec6766d2760947abd724d0c429e3d200..83fa015d93f7ead8f47a8968e55a241c17ee0f9e 100644 (file)
@@ -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@
index 2986122eb2834ab7cfd7f7da5ece953e8f179ba6..a4316064d262e2e41852e0c39e26f2491bfcd5b1 100644 (file)
@@ -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'
index f47f450085c0cef0ecfd931548505abe31a3181a..5f165d18ae8b5be51d51b893b79cc7672ab52741 100755 (executable)
@@ -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,"\