diff options
| -rwxr-xr-x | configure | 33 |
1 files changed, 18 insertions, 15 deletions
@@ -489,16 +489,19 @@ echo "" # Building the $COQTOP/config/coq_config.ml file ##################################################### -# damned backslashes under M$Windows -case $ARCH in - win32) - CAMLLIB=`echo $CAMLLIB |sed -e 's|\\\|\\\\\\\|g'` - BINDIR=`echo $BINDIR |sed -e 's|\\\|\\\\\\\|g'` - LIBDIR=`echo $LIBDIR |sed -e 's|\\\|\\\\\\\|g'` - MANDIR=`echo $MANDIR |sed -e 's|\\\|\\\\\\\|g'` - EMACSLIB=`echo $EMACSLIB |sed -e 's|\\\|\\\\\\\|g'` - ;; -esac +# An escaped version of a variable +escape_var () { +ocaml 2>&1 1>/dev/null <<EOF + prerr_endline(String.escaped(Sys.getenv"$VAR"));; +EOF +} + +export COQTOP BINDIR LIBDIR CAMLLIB +ESCCOQTOP="`VAR=COQTOP escape_var`" +ESCBINDIR="`VAR=BINDIR escape_var`" +ESCLIBDIR="`VAR=LIBDIR escape_var`" +ESCCAMLLIB="`VAR=CAMLLIB escape_var`" +ESCCAMLP4LIB="$ESCCAMLLIB"/camlp4 mlconfig_file=$COQTOP/config/coq_config.ml rm -f $mlconfig_file @@ -506,11 +509,11 @@ cat << END_OF_COQ_CONFIG > $mlconfig_file (* DO NOT EDIT THIS FILE: automatically generated by ../configure *) let local = $local -let bindir = "$BINDIR" -let coqlib = "$LIBDIR" -let coqtop = "$COQTOP" -let camllib = "$CAMLLIB" -let camlp4lib = "$CAMLP4LIB" +let bindir = "$ESCBINDIR" +let coqlib = "$ESCLIBDIR" +let coqtop = "$ESCCOQTOP" +let camllib = "$ESCCAMLLIB" +let camlp4lib = "$ESCCAMLP4LIB" let best = "$best_compiler" let arch = "$ARCH" let osdeplibs = "$OSDEPLIBS" |