[SCM] UNNAMED PROJECT branch, master, updated. 0.40-2-gdabfbf1

[Sylvestre Ledru]

The following commit has been merged in the master branch:
commit 70517873a24d01ac3342f3b8f9eaecb3466bfc07
Author: Sylvestre Ledru <sylvestre.ledru at scilab-enterprises.com>
Date:   Fri Feb 24 15:31:01 2012 +0100

    Switch to the multiarch path

diff --git a/debian/changelog b/debian/changelog
index 802bfe1..98fb43a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+javatools (0.41) UNRELEASED; urgency=low
+
+  * Switch the OpenJDK6 path to the multiarch one.
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Fri, 24 Feb 2012 15:31:11 +0100
+
 javatools (0.40) unstable; urgency=low
 
   * Fixed a regression jh_build (introduced in 0.38).
diff --git a/jh_makepkg b/jh_makepkg
index 9667ef4..a8516cf 100755
--- a/jh_makepkg
+++ b/jh_makepkg
@@ -273,7 +273,7 @@ case $COMP in
    ;;
    "open")
       COMPILER=openjdk-6-jdk
-      JAVA_HOME=/usr/lib/jvm/java-6-openjdk
+      JAVA_HOME="/usr/lib/jvm/java-6-openjdk-\$(shell dpkg-architecture -qDEB_HOST_ARCH)"
       JVM=open
    ;;
 esac

-- 
UNNAMED PROJECT