From 9eac9a77c517882f8c6c9f15c5d76c29dbd6824b Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Thu, 3 Jun 2010 15:18:05 +0200 Subject: [PATCH] rules: Define (and pass to configure) $JAR. --- debian/changelog | 4 +++- debian/rules | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 86db361..d4aef05 100644 --- 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 Thu, 03 Jun 2010 15:00:56 +0200 + -- Sebastian Harl 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 e9487ac..ebc5ff1 100755 --- 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 ) -- 2.30.2