rules: Append DEB_BUILD_ARCH to JAVA_HOME.

This is how it's done in the OpenJDK package.

diff --git a/debian/changelog b/debian/changelog
index 9f4cc096b676a89f1fb06e3c9cf5d56c189d4d7d..bbd20597a32404674a929857a443a3039a30c5b1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,8 +24,11 @@ collectd (4.10.4-1) unstable; urgency=low
     - Removed bts592623-curl_json-file -- included upstream.
     - Removed bts596128-reheap-fix -- included upstream.
     - Removed CVE-2010-4336 -- included upstream.
+  * debian/rules:
+    - Append DEB_BUILD_ARCH to JAVA_HOME; this is how it's done in the OpenJDK
+      package.
 
- -- Sebastian Harl <tokkee@debian.org>  Thu, 05 Jan 2012 15:23:40 +0100
+ -- Sebastian Harl <tokkee@debian.org>  Thu, 05 Jan 2012 15:44:44 +0100
 
 collectd (4.10.1-2.1) unstable; urgency=high
 

diff --git a/debian/rules b/debian/rules
index ea5ec27e83bbad98ab54d8cc1e1c995f6e1231ab..aa6f1005dfcba9fd488a9385744722f4ca614cc1 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -39,7 +39,7 @@ JAVA_ARCHDIR = $(strip $(patsubst $(DEB_BUILD_ARCH)=%, %, \
 ifeq (,$(JAVA_ARCHDIR))
        JAVA_ARCHDIR = $(DEB_BUILD_ARCH)
 endif
-JAVA_HOME = /usr/lib/jvm/java-6-openjdk
+JAVA_HOME = /usr/lib/jvm/java-6-openjdk-$(DEB_BUILD_ARCH)
 JAVA_LIBDIR = $(JAVA_HOME)/jre/lib/$(JAVA_ARCHDIR)/server
 
 JAVAC = $(JAVA_HOME)/bin/javac