From 66ff782bbe1e1cfb27307b19a73f61ba94648b5d Mon Sep 17 00:00:00 2001
From: Frederic Ye <frederic.ye@mlstate.com>
Date: Fri, 22 Jun 2012 17:04:22 +0200
Subject: [PATCH] [fix] install, package: renamed install_dir into libdir +
 related fix

---
 config.mli         |  6 +++---
 configure          | 10 +++++-----
 install_release.sh |  2 +-
 qml2js/qml2js.ml   |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/config.mli b/config.mli
index 4d789af5..8cd219ad 100644
--- a/config.mli
+++ b/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
diff --git a/configure b/configure
index 537b6995..32e400d1 100755
--- a/configure
+++ b/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"
diff --git a/install_release.sh b/install_release.sh
index 24d4853d..737878f8 100755
--- a/install_release.sh
+++ b/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"
diff --git a/qml2js/qml2js.ml b/qml2js/qml2js.ml
index 970ed459..859348ef 100644
--- a/qml2js/qml2js.ml
+++ b/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";