aboutsummaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorHugo Herbelin2017-05-13 22:37:27 +0200
committerHugo Herbelin2017-06-04 16:40:43 +0200
commit299cbc41f74aa4dd8ddfd14ca9da3a92cff34474 (patch)
tree4e58b6dcb547503294236da50201ec62e0b493e8 /configure
parentce1e1dba837ad6e2c79ff7e531b5e3adea3cd327 (diff)
Fixing an inconsistency between configure and configure.ml.
The shell script configure was assuming the existence of option -camldir which was removed in 333d41a9.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure5
1 files changed, 3 insertions, 2 deletions
diff --git a/configure b/configure
index 09585e59ee..d976cc7fe5 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