- Rollback --libdir.

Make.macos

@@ -5,9 +5,10 @@ include VERSION
 
 package-macosx: 
 	mkdir -p package-macosx/root
+	mkdir -p package-macosx/root/lib/ocaml
 	sh configure --prefix=`pwd`/package-macosx/root
-	make install
-	export VERSION=$(VERSION) && tools/make-package-macosx
+	OCAMLFIND_DESTDIR=package-macosx/root/lib/ocaml make install
+	VERSION=$(VERSION) tools/make-package-macosx
 
 clean-macosx:
 	sudo rm -rf package-macosx

Makefile.distrib

@@ -20,7 +20,7 @@ PACKAGES = camlp4 ulex pcre num netstring
 
 # Call make with VERBOSE=true to get a trace of commands
 
-VERBOSE=false
+VERBOSE=true
 
 ifneq ($(VERBOSE), true)
    HIDE=@
@@ -59,11 +59,8 @@ endif
 ifeq ($(INTERFACE), true)
 	OPT += -passopt -i
 endif
-ifeq ($(LIBDIR), false)
-    OCAMLFIND = ocamlfind
-else
-    OCAMLFIND = ocamlfind -destdir $(LIBDIR)
-endif
+
+OCAMLFIND = ocamlfind
 CAMLC = $(OCAMLFIND) $(CAMLC_P) $(OPT) -package "$(PACKAGES)"
 CAMLOPT = $(OCAMLFIND) $(CAMLOPT_P) $(OPT) -package "$(PACKAGES)"
 

configure.ml

@@ -37,7 +37,6 @@ OCaml/CDuce interface:
 Installation directories:
  --prefix=PREFIX       install files in PREFIX [/usr/local]
  --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]
  --docdir=DIR          install the rest of the doc in DIR [PREFIX/doc/cduce]
 ";
@@ -62,7 +61,6 @@ let features =
 let vars = 
   [ "prefix", ref "/usr/local";
     "bindir", ref "";
-    "libdir", ref "";
     "mandir", ref "";
     "docdir", ref "";
 
@@ -218,7 +216,6 @@ let pxp_wlex = check_feature "pxp_wlex" (check_pkg "pxp-wlex-utf8")
 let prefix = dir "prefix"
 let bindir = dir ~def:(prefix^"/bin") "bindir"
 let mandir = dir ~def:(prefix^"/man") "mandir"
-let libdir = dir ~def:("false") "libdir"
 let docdir = dir ~def:(prefix^"/doc/cduce") "docdir"
 let wprefix = dir "wprefix"
 let cgidir = dir ~def:(wprefix^"/cgi-bin") "cgidir"
@@ -294,7 +291,6 @@ let () =
   fprintf out "CGI=%b\n" cgi;
   fprintf out "PXP_WLEX=%b\n" pxp_wlex;
   fprintf out "BINDIR=%s\n" bindir;
-  fprintf out "LIBDIR=%s\n" libdir;
   fprintf out "MANDIR=%s\n" mandir;
   fprintf out "DOCDIR=%s\n" docdir;
   fprintf out "CGI_DIR=%s\n" cgidir;