Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[fix] install, package: renamed install_dir into libdir + related fix

  • Loading branch information...
commit 66ff782bbe1e1cfb27307b19a73f61ba94648b5d 1 parent 6f7ac84
@Aqua-Ye Aqua-Ye authored BourgerieQuentin committed
View
6 config.mli
@@ -19,11 +19,11 @@
The .ml file is generated by the ./configure script
*)
-(** the installation prefix (also known as MLSTATELIBS from many places *)
+(** the installation prefix (also known as MLSTATELIBS from many places) *)
val prefix : string
-(** the installation directory (also known as MLSTATELIBS from many places *)
-val install_dir : string
+(** the installation library directory *)
+val lib_dir : string
(** the base directory of external ocaml libraries *)
val ocamllib : string
View
10 configure
@@ -35,10 +35,10 @@ while [ $# -gt 0 ]; do
shift
PREFIX=$1
;;
- -install-dir)
+ -libdir)
if [ $# -lt 2 ]; then echo "Error: option $1 requires an argument" >&2; exit 1; fi
shift
- INSTALL_DIR=$1
+ LIBDIR=$1
;;
-release)
IS_RELEASE=1
@@ -91,7 +91,7 @@ done
: ${PREFIX:=${MLSTATELIBS:-}}
: ${PREFIX:=/usr/local}
: ${IS_RELEASE:=}
-: ${INSTALL_DIR:=$PREFIX}
+: ${LIBDIR:=$PREFIX}
CONFIG_LOG=$PWD/config.log
@@ -714,7 +714,7 @@ done
# See config.mli for the documentation and spec of these variables
cat >config.ml <<EOF
let prefix = "$PREFIX"
-let install_dir = "$INSTALL_DIR"
+let lib_dir = "$LIBDIR"
let ocamllib = "$OCAMLLIB"
let ocamlopt = "$OCAMLOPT"
let ocamlbuild = "$OCAMLBUILD"
@@ -763,7 +763,7 @@ EOF
cat >config.sh <<EOF
PREFIX="$PREFIX"
-INSTALL_DIR="$INSTALL_DIR"
+LIBDIR="$LIBDIR"
OCAMLLIB="$OCAMLLIB"
OCAMLOPT="$OCAMLOPT"
OCAMLBUILD="$OCAMLBUILD"
View
2  install_release.sh
@@ -207,7 +207,7 @@ SRCDIR=$OPAGENERAL
OPABOOK=$OPAGENERAL/doc/book # the tutorial and book
# This is absolutely correct that the 2 variables are inversed, we should fix the value inside
-./configure -prefix $INSTALLDIR -install-dir $PREFIX -ocamlopt $OCAMLOPT -release -no-dbm
+./configure -prefix $INSTALLDIR -libdir $PREFIX -ocamlopt $OCAMLOPT -release -no-dbm
TARGETS="distrib"
View
2  qml2js/qml2js.ml
@@ -278,7 +278,7 @@ struct
/*usr/bin/env NODE_PATH=%s/lib/node_modules:$NODE_PATH node \"$0\" \"$@\"; exit $?;*/
-" Config.install_dir;
+" Config.lib_dir;
linking_generation_js_init generated_files env_js_input oc;
let read_append opx =
Printf.fprintf oc "///////////////////////\n";
Please sign in to comment.
Something went wrong with that request. Please try again.