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.
This commit is contained in:
parent
092626243a
commit
36ae666f05
|
@ -52,7 +52,7 @@ arch="@arch@"
|
||||||
build="@build@"
|
build="@build@"
|
||||||
host="@host@"
|
host="@host@"
|
||||||
|
|
||||||
bootstrap=${bootstrap-}
|
bootstrap=${bootstrap-@bootstrap@}
|
||||||
compiler=${compiler-@compiler@}
|
compiler=${compiler-@compiler@}
|
||||||
courageous=${courageous-@courageous@}
|
courageous=${courageous-@courageous@}
|
||||||
mes_system=@mes_system@
|
mes_system=@mes_system@
|
||||||
|
|
|
@ -27,9 +27,11 @@ _v=
|
||||||
if test "$V" = 2; then
|
if test "$V" = 2; then
|
||||||
set -x
|
set -x
|
||||||
fi
|
fi
|
||||||
if test "$V" -gt 0; then
|
if test -n "$V"; then
|
||||||
v=v
|
if test "$V" -gt 0; then
|
||||||
_v=-v
|
v=v
|
||||||
|
_v=-v
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
set -u
|
set -u
|
||||||
|
@ -77,6 +79,8 @@ else
|
||||||
cp $_v ChangeLog ${DESTDIR}${docdir}
|
cp $_v ChangeLog ${DESTDIR}${docdir}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
__exclude_go=
|
||||||
|
__exclude_scm=
|
||||||
if test -f module/mescc.go; then
|
if test -f module/mescc.go; then
|
||||||
__exclude_go=--exclude='*.go'
|
__exclude_go=--exclude='*.go'
|
||||||
__exclude_scm=--exclude='*.scm'
|
__exclude_scm=--exclude='*.scm'
|
||||||
|
|
|
@ -110,6 +110,7 @@ subst () {
|
||||||
-e s,"@PACKAGE_NAME@,$PACKAGE_NAME,"\
|
-e s,"@PACKAGE_NAME@,$PACKAGE_NAME,"\
|
||||||
-e s,"@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,"\
|
-e s,"@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,"\
|
||||||
-e s,"@VERSION@,$VERSION,"\
|
-e s,"@VERSION@,$VERSION,"\
|
||||||
|
-e s,"@bootstrap@,yes,"\
|
||||||
-e s,"@build@,$build,"\
|
-e s,"@build@,$build,"\
|
||||||
-e s,"@host@,$host,"\
|
-e s,"@host@,$host,"\
|
||||||
-e s,"@compiler@,$compiler,"\
|
-e s,"@compiler@,$compiler,"\
|
||||||
|
|
Loading…
Reference in a new issue