diff options
| -rwxr-xr-x | configure | 6 | ||||
| -rwxr-xr-x | install.sh | 6 | ||||
| -rw-r--r-- | lib/envars.ml | 5 |
3 files changed, 9 insertions, 8 deletions
@@ -810,10 +810,10 @@ BUILDLDPATH="# you might want to set CAML_LD_LIBRARY_PATH by hand!" case $coqrunbyteflags_spec/$local/$custom_spec/$CUSTOM_OS in yes/*/*/*) COQRUNBYTEFLAGS="$coqrunbyteflags";; */*/yes/*|*/*/*/yes) COQRUNBYTEFLAGS="-custom";; - */true/*/*) COQRUNBYTEFLAGS="-dllib -lcoqrun -dllpath $COQTOP/kernel/byterun";; + */true/*/*) COQRUNBYTEFLAGS="-dllib -lcoqrun -dllpath '$COQTOP'/kernel/byterun";; *) - COQRUNBYTEFLAGS="-dllib -lcoqrun -dllpath $LIBDIR" - BUILDLDPATH="export CAML_LD_LIBRARY_PATH=$COQTOP/kernel/byterun";; + COQRUNBYTEFLAGS="-dllib -lcoqrun -dllpath '$LIBDIR'" + BUILDLDPATH="export CAML_LD_LIBRARY_PATH='$COQTOP'/kernel/byterun";; esac case $coqtoolsbyteflags_spec/$custom_spec/$CUSTOM_OS in yes/*/*) COQTOOLSBYTEFLAGS="$coqtoolsbyteflags";; diff --git a/install.sh b/install.sh index 0719ca778..277222f58 100755 --- a/install.sh +++ b/install.sh @@ -1,13 +1,13 @@ #! /bin/sh -dest=$1 +dest="$1" shift for f; do bn=`basename $f` dn=`dirname $f` - install -d $dest/$dn - install -m 644 $f $dest/$dn/$bn + install -d "$dest/$dn" + install -m 644 $f "$dest/$dn/$bn" done diff --git a/lib/envars.ml b/lib/envars.ml index 5887adcde..d700ffe16 100644 --- a/lib/envars.ml +++ b/lib/envars.ml @@ -21,8 +21,9 @@ let guess_coqlib () = else let coqbin = System.canonical_path_name (Filename.dirname Sys.executable_name) in let prefix = Filename.dirname coqbin in - let coqlib = if Coq_config.local then prefix else - List.fold_left Filename.concat prefix ["lib";"coq"] in + let rpath = if Coq_config.local then [] else + (if Coq_config.arch = "win32" then ["lib"] else ["lib";"coq"]) in + let coqlib = List.fold_left Filename.concat prefix rpath in if Sys.file_exists (Filename.concat coqlib file) then coqlib else Util.error "cannot guess a path for Coq libraries; please use -coqlib option" |