[Pkg-ocaml-maint-commits] [SCM] ocsigen packaging branch, master, updated. debian/1.3.0-3-3-gffab94a

[Stephane Glondu]

The following commit has been merged in the master branch:
commit eae140aaa16a71b7acdbc48f854734ac41d28bb1
Author: Stephane Glondu <steph at glondu.net>
Date:   Wed Mar 24 23:01:33 2010 +0100

    Fix directory variable in META.ocsigen_ext

diff --git a/debian/changelog b/debian/changelog
index a3b7e20..fbb3e60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ocsigen (1.3.0-4) UNRELEASED; urgency=low
 
   * Fix FTBFS on hppa:
     - add 0002-Do-not-compile-dbm-test-with-custom.patch
+  * Fix "directory" variable in META.ocsigen_ext
 
  -- Stéphane Glondu <glondu at debian.org>  Mon, 22 Mar 2010 22:37:57 +0100
 
diff --git a/debian/rules b/debian/rules
index 1429b9d..ef6bf7c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,7 +28,7 @@ override_dh_auto_configure:
 	    --temproot $(DESTDIR) \
 	    --prefix /usr \
 	    --bindir /usr/bin \
-	    --libdir /usr/lib \
+	    --libdir $(OCAML_STDLIB_DIR) \
 	    --mandir /usr/share/man/man1 \
 	    --docdir /usr/share/doc \
 	    --staticpagesdir /usr/share \
@@ -48,7 +48,7 @@ override_dh_auto_configure:
 
 .PHONY: override_dh_auto_install
 override_dh_auto_install:
-	$(MAKE) $(INSTALL_TARGET) CHOWN=true MODULEINSTALLDIR=$(OCAML_STDLIB_DIR) STD_METAS_DIR=$(OCAML_STDLIB_DIR)/METAS
+	$(MAKE) $(INSTALL_TARGET) CHOWN=true STD_METAS_DIR=$(OCAML_STDLIB_DIR)/METAS
 
 # For each installed .cmi file, install the corresponding .mli file next to it
 	find $(DESTDIR) -name '*.cmi' -printf '%h %f\n' | \

-- 
ocsigen packaging