diff options
| author | notin | 2006-09-01 13:47:00 +0000 |
|---|---|---|
| committer | notin | 2006-09-01 13:47:00 +0000 |
| commit | ced086814dcb43f53f2a4e413515685d744a7993 (patch) | |
| tree | 7b48e3acdd53a605c49a73cd601ec479de4fa220 /configure | |
| parent | 9a9a2c9c330189a677d99d1e71890dcb238c53b3 (diff) | |
Suite ajout option -ocamlib à configure
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@9115 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -272,8 +272,7 @@ case $camldir_spec in esac esac;; yes) CAMLC=$camldir/$bytecamlc - bytecamlc="$CAMLC" - nativecamlc=`dirname "$bytecamlc"`/$nativecamlc;; + bytecamlc="$CAMLC";; esac if test ! -f "$CAMLC" ; then @@ -290,6 +289,7 @@ ocamldocexec=$CAMLBIN/ocamldoc ocamllexexec=$CAMLBIN/ocamllex ocamlyaccexec=$CAMLBIN/ocamlyacc camlmktopexec=$CAMLBIN/ocamlmktop +camlp4o=$CAMLBIN/camlp4o CAMLVERSION=`"$bytecamlc" -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' ` @@ -585,10 +585,11 @@ escape_var () { EOF } -export COQTOP BINDIR LIBDIR CAMLLIB +export COQTOP BINDIR LIBDIR CAMLBIN CAMLLIB ESCCOQTOP="`VAR=COQTOP escape_var`" ESCBINDIR="`VAR=BINDIR escape_var`" ESCLIBDIR="`VAR=LIBDIR escape_var`" +ESCCAMLDIR="`VAR=CAMLBIN escape_var`" ESCCAMLLIB="`VAR=CAMLLIB escape_var`" ESCCAMLP4LIB="$ESCCAMLLIB"/camlp4 @@ -601,6 +602,7 @@ let local = $local let bindir = "$ESCBINDIR" let coqlib = "$ESCLIBDIR" let coqtop = "$ESCCOQTOP" +let camldir = "$ESCCAMLDIR" let camllib = "$ESCCAMLLIB" let camlp4lib = "$ESCCAMLP4LIB" let best = "$best_compiler" |