diff --git a/debian/rules b/debian/rules
index 995325230200b742c73ecf9e277e5dc71da1ccf6..a3a41b340ff346c63d616560292011d7cdd5613d 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
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
--disable-xmms \
--without-libstatgrab
-# libiptc is no longer available on Debian (see #472655).
-confflags += --disable-iptables
-
# 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 libraries netstat and upsclient 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-netlink --disable-nut
endif
confflags += --disable-libvirt
endif
+# Force the inclusion of the ipmi plugin and manually specify its
+# dependencies to work around #474087 (broken openipmi .pc files).
+BUILD_WITH_OPENIPMI_LIBS = -lOpenIPMIpthread -lOpenIPMIutils -lOpenIPMI
+confflags += --enable-ipmi
+
config.status: configure $(DPATCH_STAMPFN)
dh_testdir
- CFLAGS="$(CFLAGS)" ./configure $(confflags)
+ BUILD_WITH_OPENIPMI_LIBS="$(BUILD_WITH_OPENIPMI_LIBS)" \
+ CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" ./configure $(confflags)
build: build-stamp
[ ! -f Makefile ] || $(MAKE) distclean
rm -f debian/README.Debian.plugins
+ rm -f src/*.1 src/*.5
dh_clean
debconf-updatepo
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
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 \
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 \