Commit 7a406049 authored by Pietro Abate's avatar Pietro Abate
Browse files

- Rollback --libdir.

parent 8203e6b4
...@@ -5,9 +5,10 @@ include VERSION ...@@ -5,9 +5,10 @@ include VERSION
package-macosx: package-macosx:
mkdir -p package-macosx/root mkdir -p package-macosx/root
mkdir -p package-macosx/root/lib/ocaml
sh configure --prefix=`pwd`/package-macosx/root sh configure --prefix=`pwd`/package-macosx/root
make install OCAMLFIND_DESTDIR=package-macosx/root/lib/ocaml make install
export VERSION=$(VERSION) && tools/make-package-macosx VERSION=$(VERSION) tools/make-package-macosx
clean-macosx: clean-macosx:
sudo rm -rf package-macosx sudo rm -rf package-macosx
......
...@@ -20,7 +20,7 @@ PACKAGES = camlp4 ulex pcre num netstring ...@@ -20,7 +20,7 @@ PACKAGES = camlp4 ulex pcre num netstring
# Call make with VERBOSE=true to get a trace of commands # Call make with VERBOSE=true to get a trace of commands
VERBOSE=false VERBOSE=true
ifneq ($(VERBOSE), true) ifneq ($(VERBOSE), true)
HIDE=@ HIDE=@
...@@ -59,11 +59,8 @@ endif ...@@ -59,11 +59,8 @@ endif
ifeq ($(INTERFACE), true) ifeq ($(INTERFACE), true)
OPT += -passopt -i OPT += -passopt -i
endif endif
ifeq ($(LIBDIR), false)
OCAMLFIND = ocamlfind OCAMLFIND = ocamlfind
else
OCAMLFIND = ocamlfind -destdir $(LIBDIR)
endif
CAMLC = $(OCAMLFIND) $(CAMLC_P) $(OPT) -package "$(PACKAGES)" CAMLC = $(OCAMLFIND) $(CAMLC_P) $(OPT) -package "$(PACKAGES)"
CAMLOPT = $(OCAMLFIND) $(CAMLOPT_P) $(OPT) -package "$(PACKAGES)" CAMLOPT = $(OCAMLFIND) $(CAMLOPT_P) $(OPT) -package "$(PACKAGES)"
......
...@@ -37,7 +37,6 @@ OCaml/CDuce interface: ...@@ -37,7 +37,6 @@ OCaml/CDuce interface:
Installation directories: Installation directories:
--prefix=PREFIX install files in PREFIX [/usr/local] --prefix=PREFIX install files in PREFIX [/usr/local]
--bindir=DIR install user executables in DIR [PREFIX/bin] --bindir=DIR install user executables in DIR [PREFIX/bin]
--libdir=DIR install man documentation in DIR [ocamlfind printconf destdir]
--mandir=DIR install man documentation in DIR [PREFIX/man] --mandir=DIR install man documentation in DIR [PREFIX/man]
--docdir=DIR install the rest of the doc in DIR [PREFIX/doc/cduce] --docdir=DIR install the rest of the doc in DIR [PREFIX/doc/cduce]
"; ";
...@@ -62,7 +61,6 @@ let features = ...@@ -62,7 +61,6 @@ let features =
let vars = let vars =
[ "prefix", ref "/usr/local"; [ "prefix", ref "/usr/local";
"bindir", ref ""; "bindir", ref "";
"libdir", ref "";
"mandir", ref ""; "mandir", ref "";
"docdir", ref ""; "docdir", ref "";
...@@ -218,7 +216,6 @@ let pxp_wlex = check_feature "pxp_wlex" (check_pkg "pxp-wlex-utf8") ...@@ -218,7 +216,6 @@ let pxp_wlex = check_feature "pxp_wlex" (check_pkg "pxp-wlex-utf8")
let prefix = dir "prefix" let prefix = dir "prefix"
let bindir = dir ~def:(prefix^"/bin") "bindir" let bindir = dir ~def:(prefix^"/bin") "bindir"
let mandir = dir ~def:(prefix^"/man") "mandir" let mandir = dir ~def:(prefix^"/man") "mandir"
let libdir = dir ~def:("false") "libdir"
let docdir = dir ~def:(prefix^"/doc/cduce") "docdir" let docdir = dir ~def:(prefix^"/doc/cduce") "docdir"
let wprefix = dir "wprefix" let wprefix = dir "wprefix"
let cgidir = dir ~def:(wprefix^"/cgi-bin") "cgidir" let cgidir = dir ~def:(wprefix^"/cgi-bin") "cgidir"
...@@ -294,7 +291,6 @@ let () = ...@@ -294,7 +291,6 @@ let () =
fprintf out "CGI=%b\n" cgi; fprintf out "CGI=%b\n" cgi;
fprintf out "PXP_WLEX=%b\n" pxp_wlex; fprintf out "PXP_WLEX=%b\n" pxp_wlex;
fprintf out "BINDIR=%s\n" bindir; fprintf out "BINDIR=%s\n" bindir;
fprintf out "LIBDIR=%s\n" libdir;
fprintf out "MANDIR=%s\n" mandir; fprintf out "MANDIR=%s\n" mandir;
fprintf out "DOCDIR=%s\n" docdir; fprintf out "DOCDIR=%s\n" docdir;
fprintf out "CGI_DIR=%s\n" cgidir; fprintf out "CGI_DIR=%s\n" cgidir;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment