From 8a101d43bada5bde928fd7c30aca0d4fbad7f889 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Thu, 5 Jan 2012 15:45:36 +0100 Subject: [PATCH] rules: Append DEB_BUILD_ARCH to JAVA_HOME. This is how it's done in the OpenJDK package. --- debian/changelog | 5 ++++- debian/rules | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9f4cc09..bbd2059 100644 --- 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 Thu, 05 Jan 2012 15:23:40 +0100 + -- Sebastian Harl 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 ea5ec27..aa6f100 100755 --- 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 -- 2.30.2