aboutsummaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authornotin2009-01-22 13:41:52 +0000
committernotin2009-01-22 13:41:52 +0000
commitf33ea164bb30e89542c4febea9193e217047e32e (patch)
tree51e9729525ec7896e14bca3456544b158b768e5d /configure
parent3c767fca720f26abfc5622e99757fcce87b043e1 (diff)
Fix d'un petit problème avec ocamlmklib en présence de l'option -camldir
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@11834 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure5
1 files changed, 3 insertions, 2 deletions
diff --git a/configure b/configure
index 576b902a13..000a26ca38 100755
--- a/configure
+++ b/configure
@@ -90,7 +90,7 @@ usage () {
# Default OCaml binaries
bytecamlc=ocamlc
nativecamlc=ocamlopt
-ocamlmklib=ocamlmklib
+ocamlmklibexec=ocamlmklib
ocamlexec=ocaml
ocamldepexec=ocamldep
ocamldocexec=ocamldoc
@@ -375,6 +375,7 @@ case $camldir_spec in
ocamllexexec=$CAMLBIN/ocamllex
ocamlyaccexec=$CAMLBIN/ocamlyacc
ocamlmktopexec=$CAMLBIN/ocamlmktop
+ ocamlmklibexec=$CAMLBIN/ocamlmklib
camlp4oexec=$CAMLBIN/camlp4o
esac
@@ -983,7 +984,7 @@ sed -e "s|LOCALINSTALLATION|$local|" \
-e "s|DLLEXTENSION|$DLLEXT|" \
-e "s|EXECUTEEXTENSION|$EXE|" \
-e "s|BYTECAMLC|$bytecamlc|" \
- -e "s|OCAMLMKLIBEXEC|$ocamlmklib|" \
+ -e "s|OCAMLMKLIBEXEC|$ocamlmklibexec|" \
-e "s|NATIVECAMLC|$nativecamlc|" \
-e "s|OCAMLEXEC|$ocamlexec|" \
-e "s|OCAMLDEPEXEC|$ocamldepexec|" \