rules: Use -rpath to tell the "java" plugin where to find libjvm.so.

diff --git a/debian/changelog b/debian/changelog
index 71a1e5026bcc3f83a1a947f4b571ee5960d91500..160a96eedd7a4cf77ec222213fdf2f001c2322e4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ collectd (4.7.2-1) unstable; urgency=low
       configure, using OpenJDK found in /usr/lib/jvm/java-6-openjdk. The
       archdir mapping used by the openjdk-6 Debian package is used to find
       libjvm.so in JAVA_HOME/jre/lib/ARCHDIR/server.
+    - Use -rpath to tell the "java" plugin where to find libjvm.so.
     - Pass --enable-all-plugins to configure to make sure that the build fails
       if any prerequisites are missing.
   * debian/control:
@@ -37,7 +38,7 @@ collectd (4.7.2-1) unstable; urgency=low
       version 4 of collectd - the script now supports the --recursive option
       which takes care of that.
 
- -- Sebastian Harl <tokkee@debian.org>  Thu, 23 Jul 2009 23:35:03 +0200
+ -- Sebastian Harl <tokkee@debian.org>  Sun, 26 Jul 2009 22:14:25 +0200
 
 collectd (4.6.3-1) unstable; urgency=low
 

diff --git a/debian/rules b/debian/rules
index 0d8a9b100e70f3027284453a884a6b714b8e7d31..6b2c1055b5a1e77af455ff7b06b4fcd1c6342d09 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -39,10 +39,11 @@ JAVA_ARCHDIR_MAP = alpha=alpha arm=arm armel=arm amd64=amd64 hppa=parisc \
 JAVA_ARCHDIR = $(strip $(patsubst $(DEB_BUILD_ARCH)=%, %, \
                        $(filter $(DEB_BUILD_ARCH)=%, $(JAVA_ARCHDIR_MAP))))
 JAVA_HOME = /usr/lib/jvm/java-6-openjdk
+JAVA_LIBDIR = $(JAVA_HOME)/jre/lib/$(JAVA_ARCHDIR)/server
 
 JAVAC = $(JAVA_HOME)/bin/javac
 JAVA_CPPFLAGS = -I$(JAVA_HOME)/include
-JAVA_LDFLAGS = -L$(JAVA_HOME)/jre/lib/$(JAVA_ARCHDIR)/server
+JAVA_LDFLAGS = -L$(JAVA_LIBDIR) -Wl,-rpath -Wl,$(JAVA_LIBDIR)
 
 include /usr/share/dpatch/dpatch.make