diff options
-rwxr-xr-x | configure | 22 |
1 files changed, 8 insertions, 14 deletions
@@ -41,11 +41,11 @@ gcc_version=`grep '^gcc version' $srcdir/README | # Decode options for opt do - optarg=`expr x$opt : 'x[^=]*=\(.*\)'` + optarg=`expr x"$opt" : 'x[^=]*=\(.*\)'` case "$opt" in CC=*|CFLAGS=*|GNATMAKE=*) - optvar=`expr x$opt : 'x\([^=]*\)=.*'` - eval $optvar="$optarg" + optvar=`expr x"$opt" : 'x\([^=]*\)=.*'` + eval $optvar=\"$optarg\" ;; --prefix=*) prefix="$optarg";; --srcdir=*) srcdir="$optarg";; @@ -133,26 +133,20 @@ echo echo "# Generated by:" echo $echon "# $progname"$echoc for opt do - echo $echon " $opt"$echoc + echo $echon \ \"$opt\"$echoc done echo echo echo subst_vars=\"$subst_vars\" for v in $subst_vars; do eval vval=\$$v - echo $v="$vval" + echo $v=\"$vval\" done -echo -echo 'sed_opts=""' -echo 'for v in $subst_vars; do' -echo ' eval vval=\$$v' -echo ' sed_opts="$sed_opts -e s%@${v}@%$vval%g"' -echo 'done' -echo +sed_opts=`echo $subst_vars | sed -e "s/\\([a-zA-Z_]*\\)/-e \"s%@\1@%\$\1%g\"/g"` echo 'echo "Creating ghdl.gpr"' -echo 'sed $sed_opts < $srcdir/ghdl.gpr.in > ghdl.gpr' +echo sed $sed_opts '< $srcdir/ghdl.gpr.in > ghdl.gpr' echo 'echo "Creating Makefile"' -echo 'sed $sed_opts < $srcdir/Makefile.in > Makefile' +echo sed $sed_opts '< $srcdir/Makefile.in > Makefile' } > config.status || \ { echo "$progname: cannot create config.status" |