[Pkg-ocaml-maint-commits] [SCM] camljava packaging branch, master, updated. upstream/0.3.orig-5-g41faf0a

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit 41faf0ae65d14125edb012fa3dceb6c830ce5e41
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Thu Nov 26 14:51:14 2009 +0100

    use Debian default-java dir as $(JDKHOME)

diff --git a/debian/rules b/debian/rules
index 74c9860..3e76fb8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,8 @@ DEFJAVA_DIR = /usr/lib/jvm/default-java
 # reliable mapping available yet (see #558109)
 JAVA_ARCH := $(shell find $(DEFJAVA_DIR)/ -path '*jre/lib/*/server/libjvm.so' | cut -f 8 -d /)
 
-BUILD_TARGET_FLAGS = ARCH=$(JAVA_ARCH)
+BUILD_TARGET_FLAGS = JDKHOME=$(DEFJAVA_DIR)
+BUILD_TARGET_FLAGS += ARCH=$(JAVA_ARCH)
 DEB_MAKE_INSTALL_TARGET = install CAMLJAVALIB=$(DESTDIR)
 ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
 DEB_MAKE_BUILD_TARGET = all $(BUILD_TARGET_FLAGS)

-- 
camljava packaging