diff --git a/debian/rules b/debian/rules
index 6da01b59c48099752734f5a40c9069959f818118..af70f20dc99c346a4e4cc896643194aa948b98b2 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
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
# libkstat is required for the xfs_arc plugin.
confflags += --disable-zfs-arc
-# build-deps for these plugins are not available on Squeeze
-confflags += \
- --disable-amqp \
- --disable-modbus
-
# The static library netstat cannot be linked into shared objects on some
# architectures (see bugs #358637, #419684 and #524593 for more details).
ifneq (,$(filter alpha amd64 hppa ia64 ppc64 mips mipsel, $(DEB_BUILD_ARCH)))