aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rwxr-xr-xconfigure5
-rw-r--r--configure.ml2
2 files changed, 5 insertions, 2 deletions
diff --git a/configure b/configure
index 09585e59e..d976cc7fe 100755
--- a/configure
+++ b/configure
@@ -3,7 +3,7 @@
## This micro-configure shell script is here only to
## launch the real configuration via ocaml
-cmd=ocaml
+ocaml=ocaml
script=./configure.ml
if [ ! -f $script ]; then
@@ -16,10 +16,11 @@ fi
## Parse the args, only looking for -camldir
## We avoid using shift to keep "$@" intact
+cmd=$ocaml
last=
for i; do
case $last in
- -camldir|--camldir) cmd="$i/ocaml"; break;;
+ -camldir) cmd="$i/$ocaml"; break;;
esac
last=$i
done
diff --git a/configure.ml b/configure.ml
index 04b04979d..6a78337d4 100644
--- a/configure.ml
+++ b/configure.ml
@@ -349,6 +349,8 @@ let args_options = Arg.align [
" URL of the coq website";
"-force-caml-version", Arg.Set Prefs.force_caml_version,
" Force OCaml version";
+ "-camldir", Arg.String (fun _ -> ()),
+ "<dir> Specifies path to ocaml for running configure script";
]
let parse_args () =