Compilation de Coq sous Windows

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@9098 85f007b7-540e-0410-9357-904b9bb8a0f7

1 files changed, 14 insertions, 14 deletions

diff --git a/configure b/configure
index 90ab5221bc..7a9e10de4d 100755
--- a/configure
+++ b/configure
@@ -48,7 +48,7 @@ coqide_spec=no
 with_geoproof=true
 
 # COQTOP=`pwd`
-
+COQSRC=`pwd`
 
 # Parse command-line arguments
 
@@ -248,7 +248,7 @@ CAMLTAG=OCAML`echo $CAMLVERSION | sed -e "s/\([1-9]\)\.\([0-9]*\).*/\1\2/g"`
 # do we have a native compiler: test of ocamlopt and its version
 
 if [ "$best_compiler" = "opt" ] ; then
-  if test -e $nativecamlc ; then
+  if test -e "$nativecamlc" ; then
       CAMLOPTVERSION=`"$nativecamlc" -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' `
       if [ "$CAMLOPTVERSION" != "$CAMLVERSION" ] ; then
 	  echo "native and bytecode compilers do not have the same version!"; fi
@@ -508,7 +508,7 @@ echo ""
 
 # An escaped version of a variable
 escape_var () {
-$CAMLBIN/ocaml 2>&1 1>/dev/null <<EOF
+"$CAMLBIN"/ocaml 2>&1 1>/dev/null <<EOF
   prerr_endline(String.escaped(Sys.getenv"$VAR"));;
 EOF
 }
@@ -520,7 +520,7 @@ ESCLIBDIR="`VAR=LIBDIR escape_var`"
 ESCCAMLLIB="`VAR=CAMLLIB escape_var`"
 ESCCAMLP4LIB="$ESCCAMLLIB"/camlp4
 
-mlconfig_file=$COQTOP/config/coq_config.ml
+mlconfig_file="$COQSRC/config/coq_config.ml"
 rm -f $mlconfig_file
 cat << END_OF_COQ_CONFIG > $mlconfig_file
 (* DO NOT EDIT THIS FILE: automatically generated by ../configure *)
@@ -548,25 +548,25 @@ PRINTF=`which printf`
 
 # Subdirectories of theories/ added in coq_config.ml
 subdirs () {
-    (cd $1; find * -type d ! -name .svn -exec $PRINTF "\"%s\";\n" {} \; | grep -v extraction/test | grep -v correctness >> $mlconfig_file)
+    (cd $1; find * -type d ! -name .svn -exec $PRINTF "\"%s\";\n" {} \; | grep -v extraction/test | grep -v correctness >> "$mlconfig_file")
 }
 
-echo "let theories_dirs = [" >> $mlconfig_file
+echo "let theories_dirs = [" >> "$mlconfig_file"
 subdirs theories
-echo "]" >> $mlconfig_file
+echo "]" >> "$mlconfig_file"
 
-echo "let contrib_dirs = [" >> $mlconfig_file
+echo "let contrib_dirs = [" >> "$mlconfig_file"
 subdirs contrib
-echo "]" >> $mlconfig_file
+echo "]" >> "$mlconfig_file"
 
-chmod a-w $mlconfig_file
+chmod a-w "$mlconfig_file"
 
 
 ###############################################
 # Building the $COQTOP/config/Makefile file
 ###############################################
 
-rm -f $COQTOP/config/Makefile
+rm -f "$COQSRC/config/Makefile"
 
 # damned backslashes under M$Windows (bis)
 case $ARCH in
@@ -602,7 +602,7 @@ sed -e "s|LOCALINSTALLATION|$local|" \
     -e "s|ARCHITECTURE|$ARCH|" \
     -e "s|OSDEPENDENTLIBS|$OSDEPLIBS|" \
     -e "s|OSDEPENDENTP4OPTFLAGS|$OSDEPP4OPTFLAGS|" \
-    -e "s|CAMLLIBDIRECTORY|$CAMLLIB|" \
+    -e "s|CAMLLIBDIRECTORY|$ESCCAMLLIB|" \
     -e "s|CAMLTAG|$CAMLTAG|" \
     -e "s|CAMLP4BINDIRECTORY|$ESCCAMLP4BIN|" \
     -e "s|CAMLP4LIBDIRECTORY|$CAMLP4LIB|" \
@@ -624,9 +624,9 @@ sed -e "s|LOCALINSTALLATION|$local|" \
     -e "s|REALSOPT|$reals|" \
     -e "s|COQIDEOPT|$COQIDE|" \
     -e "s|CHECKEDOUTSOURCETREE|$checkedout|" \
-      $COQTOP/config/Makefile.template > $COQTOP/config/Makefile
+      "$COQSRC/config/Makefile.template" > "$COQSRC/config/Makefile"
 
-chmod a-w $COQTOP/config/Makefile
+chmod a-w "$COQSRC/config/Makefile"
 
 ##################################################
 # Building the $COQTOP/dev/ocamldebug-coq file