X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=debian%2Frules;h=06c5436ff1893822f0b2d6a3f031cf5f7a6471eb;hb=710ebea3345f49204f7ff8e6ebd0bfbf1587cedc;hp=636e7f6c4f904baee8fa2a7d6347dd180baa5c94;hpb=f40ca42e6ecfc5f1cb701566adbd2d628d3fd666;p=pkg-collectd.git

diff --git a/debian/rules b/debian/rules
index 636e7f6..06c5436 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,13 +12,14 @@ DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_ARCH      ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-CFLAGS = -Wall -g -I$(CURDIR)/debian/include
+CPPFLAGS = -I$(CURDIR)/debian/include
+CFLAGS = -Wall -g
 
 # There is no way to tell lt_dlopen() to use the RTLD_GLOBAL flag which is
 # however required by the perl plugin (which would otherwise be unable to find
 # symbols defined in libperl when loading perl modules that require such
 # symbols). This is a workaround for this issue.
-CFLAGS += -DLT_LAZY_OR_NOW='RTLD_LAZY|RTLD_GLOBAL'
+CPPFLAGS += -DLT_LAZY_OR_NOW='RTLD_LAZY|RTLD_GLOBAL'
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
@@ -39,15 +40,20 @@ confflags = --host=$(DEB_HOST_GNU_TYPE) \
 # These plugins do not provide any functionality under Linux.
 confflags += --disable-apple_sensors --disable-tape
 
-# The static libraries iptc, netstat and upsclient cannot be used on
-# 64bit systems (see bugs #358637 and #419684 for more details).
+# The static library netstat cannot be linked into shared objects on some
+# architectures (see bugs #358637 and #419684 for more details).
 ifneq (,$(findstring $(DEB_BUILD_ARCH),alpha amd64 hppa ia64 ppc64))
-	confflags += --disable-iptables --disable-netlink --disable-nut
+	confflags += --disable-netlink
+endif
+
+# libvirt is only available on amd64, i386 and powerpc.
+ifeq (,$(findstring $(DEB_BUILD_ARCH),amd64 i386 powerpc))
+	confflags += --disable-libvirt
 endif
 
 config.status: configure $(DPATCH_STAMPFN)
 	dh_testdir
-	CFLAGS="$(CFLAGS)" ./configure $(confflags)
+	CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" ./configure $(confflags)
 
 build: build-stamp
 
@@ -67,6 +73,7 @@ clean: unpatch
 	[ ! -f Makefile ] || $(MAKE) distclean
 	
 	rm -f debian/README.Debian.plugins
+	rm -f src/*.1 src/*.5
 	
 	dh_clean 
 	debconf-updatepo
@@ -98,9 +105,11 @@ install-arch: build
 		debian/collectd/etc/collectd/collectd.conf
 	install -m 0644 debian/collection.conf \
 		debian/collectd/etc/collectd/collection.conf
+	install -m 0644 debian/thresholds.conf \
+		debian/collectd/etc/collectd/thresholds.conf
 	
 	mkdir -p debian/collectd/usr/lib/collectd/utils/
-	for UTIL in extractDS.px migrate-3-4.px; do \
+	for UTIL in rrd_filter.px migrate-3-4.px; do \
 		cp contrib/$$UTIL debian/collectd/usr/lib/collectd/utils/; \
 	done
 	
@@ -117,7 +126,7 @@ binary-indep: install-indep
 	dh_installdocs -A -i debian/README.Debian AUTHORS README TODO
 	dh_installexamples -i contrib/examples/myplugin.c \
 		contrib/examples/MyPlugin.pm
-	dh_compress -i -Xexamples/myplugin.c -Xexamples/MyPlugin.c
+	dh_compress -i -Xexamples/
 	dh_fixperms -i
 	dh_installdeb -i
 	dh_gencontrol -i
@@ -131,18 +140,21 @@ binary-arch: build install-arch
 	dh_installdocs -A -a debian/README.Debian AUTHORS README TODO
 	dh_installdocs -a debian/NEWS.Debian debian/README.Debian.plugins
 	dh_installexamples -a contrib/collectd2html.pl contrib/collection.cgi \
+		contrib/collection3/ \
 		contrib/exec-munin.conf contrib/exec-munin.px contrib/exec-smartctl \
+		contrib/exec-nagios.conf contrib/exec-nagios.px \
 		contrib/SpamAssassin/ contrib/iptables/ contrib/cussh.pl \
-		contrib/snmp-data.conf
+		contrib/snmp-data.conf contrib/add_rra.sh contrib/network-proxy.py
 	dh_installdebconf -a
 	dh_installinit -a -- defaults 95
 	dh_link -a
 	dh_strip -a --dbg-package=collectd-dbg
-	dh_compress -a
+	dh_compress -a -Xexamples/
 	dh_fixperms -a
 	dh_installdeb -a
 	dpkg-shlibdeps -Tdebian/collectd.substvars \
 		-dDepends debian/collectd/usr/bin/* debian/collectd/usr/sbin/* \
+			debian/collectd/usr/lib/collectd/rrdtool.so \
 		-dRecommends debian/collectd/usr/lib/collectd/*.so
 	dh_gencontrol -a
 	dh_md5sums -a