rules: Define (and pass to configure) $JAR.

diff --git a/debian/changelog b/debian/changelog
index 86db361dca85dd0bebec3f3d89c778a95af50c86..d4aef050a6a2c4ff91c7fa342297ac2ac546dd68 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,8 +12,10 @@ collectd (4.10.0-1) unstable; urgency=low
   * debian/patches:
     - Removed bts566199_collection_hide_types -- applied upstream.
     - Removed typo_fixes -- applied upstream.
+  * debian/rules:
+    - Define (and pass to configure) $JAR.
 
- -- Sebastian Harl <tokkee@debian.org>  Thu, 03 Jun 2010 15:00:56 +0200
+ -- Sebastian Harl <tokkee@debian.org>  Thu, 03 Jun 2010 15:17:43 +0200
 
 collectd (4.9.1-2) unstable; urgency=low
 

diff --git a/debian/rules b/debian/rules
index e9487ac8771f8499533922519a0094f2c70f9363..ebc5ff18559caa226d3bab854c0a527ce97d7c9e 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -43,6 +43,7 @@ JAVA_HOME = /usr/lib/jvm/java-6-openjdk
 JAVA_LIBDIR = $(JAVA_HOME)/jre/lib/$(JAVA_ARCHDIR)/server
 
 JAVAC = $(JAVA_HOME)/bin/javac
+JAR = $(JAVA_HOME)/bin/jar
 JAVA_CPPFLAGS = -I$(JAVA_HOME)/include
 JAVA_LDFLAGS = -L$(JAVA_LIBDIR) -Wl,-rpath -Wl,$(JAVA_LIBDIR)
 
@@ -150,7 +151,7 @@ config.status: configure $(DPATCH_STAMPFN)
        
        PKG_CONFIG_PATH="$(CURDIR)/debian/pkgconfig:$$PKG_CONFIG_PATH" \
        ./configure $(confflags) CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" \
-               JAVAC="$(JAVAC)" JAVA_CPPFLAGS="$(JAVA_CPPFLAGS)" \
+               JAVAC="$(JAVAC)" JAR="$(JAR)" JAVA_CPPFLAGS="$(JAVA_CPPFLAGS)" \
                JAVA_LDFLAGS="$(JAVA_LDFLAGS)" \
                || ( status=$$?; cat config.log; exit $$status )