Merged branch 'experimental' into debmon-squeeze

[pkg-collectd.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index 03e769862b77dea57037a3a7eca51df4f8b48669..6da01b59c48099752734f5a40c9069959f818118 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -37,7 +37,7 @@ JAVA_ARCHDIR = $(shell /usr/share/javahelper/java-arch.sh $(DEB_BUILD_ARCH))
 ifeq (,$(JAVA_ARCHDIR))
        JAVA_ARCHDIR = $(DEB_BUILD_ARCH)
 endif
-JAVA_HOME = /usr/lib/jvm/java-6-openjdk-$(DEB_BUILD_ARCH)
+JAVA_HOME = /usr/lib/jvm/java-6-openjdk
 JAVA_LIBDIR = $(JAVA_HOME)/jre/lib/$(JAVA_ARCHDIR)/server
 
 JAVAC = $(JAVA_HOME)/bin/javac
@@ -91,6 +91,7 @@ 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
@@ -113,6 +114,12 @@ ifneq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH)))
                --disable-vserver
 endif
 
+# This plugin is FreeBSD-specific.
+ifeq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH)))
+       confflags += \
+               --disable-pf
+endif
+
 # These plugins have not been ported to FreeBSD yet.
 ifneq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH)))
        # Work-around an incomplete check for kvm functionality
@@ -218,6 +225,14 @@ install-arch: build
        rm -f debian/tmp/usr/lib/libcollectdclient.la
        rm -f debian/tmp/etc/collectd.conf
        
+       # this was broken by passing INSTALL_BASE rather than PREFIX to
+       # Makefile.PL
+       install -d -m 755 debian/tmp/usr/share/man/man3
+       mv debian/tmp/usr/man/man3/Collectd::Unixsock.3pm \
+               debian/tmp/usr/share/man/man3/
+       install -d -m 755 debian/tmp/usr/share/
+       mv debian/tmp/usr/lib/perl5 debian/tmp/usr/share/
+       
        dh_install -a --sourcedir=$(CURDIR)/debian/tmp --fail-missing
        
        perl ./debian/bin/gen_plugin_deps.pl
@@ -254,6 +269,7 @@ binary-arch: build install-arch
                contrib/snmp-data.conf contrib/add_rra.sh contrib/network-proxy.py \
                contrib/collectd_network.py contrib/collectd_unixsock.py \
                contrib/snmp-probe-host.px contrib/GenericJMX.conf \
+               contrib/postgresql \
                debian/collectd.conf debian/filters.conf debian/thresholds.conf
        # some upstream tarballs have been built inside a dirty working dir
        ( cd debian/collectd-core/ \