X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=debian%2Frules;h=48dac71fb942ae1db5f138c2cec273215b2c3b3c;hb=d5e8abf170dc988c09c98ca1a085c50123874435;hp=7675dad0c995a8a748a803e8c9f73b5b77733d69;hpb=9519bf0f7729b13ee6b00ada36f320ca42238b89;p=pkg-pnp4nagios.git

diff --git a/debian/rules b/debian/rules
index 7675dad..48dac71 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,15 +32,18 @@ config.status: configure
 
 	./configure $(CROSS) \
 				--with-layout=debian \
-				--prefix=/usr \
-				--mandir=\$${prefix}/share/man \
-				--infodir=\$${prefix}/share/info \
+				--mandir=/usr/share/man \
+				--infodir=/usr/share/info \
 				--without-kohana \
 				--with-kohana_system=/usr/share/php/kohana2/system \
 				--with-httpd-conf=/etc/apache2/conf.d \
 				CFLAGS="$(CFLAGS)"
 
-build: build-stamp
+build: build-arch build-indep
+
+build-arch: build-stamp
+
+build-indep: build-stamp
 
 build-stamp: $(QUILT_STAMPFN) config.status
 	dh_testdir
@@ -71,6 +74,7 @@ clean: unpatch
 	[ ! -f Makefile ] || $(MAKE) distclean
 
 	dh_clean
+	debconf-updatepo
 
 install: build
 	dh_testdir
@@ -96,11 +100,6 @@ install: build
 	mkdir -p debian/tmp/usr/sbin/
 	mv debian/tmp/usr/bin/npcd \
 		debian/tmp/usr/sbin/
-	mv debian/tmp/etc/pnp4nagios/npcd.cfg-sample \
-		debian/tmp/etc/pnp4nagios/npcd.cfg
-
-	mv debian/tmp/etc/pnp4nagios/process_perfdata.cfg-sample \
-		debian/tmp/etc/pnp4nagios/process_perfdata.cfg
 
 	mv debian/tmp/etc/pnp4nagios/rra.cfg-sample \
 		debian/tmp/etc/pnp4nagios/rra.cfg
@@ -142,6 +141,10 @@ install: build
 
 	cp -av sample-config/httpd.conf debian/tmp/etc/pnp4nagios/apache.conf
 
+	# Remove unnecessary config files (duplicates)
+	rm -f debian/tmp/etc/pnp4nagios/config_local.php
+	rm -f debian/tmp/etc/pnp4nagios/config.php.0.6*
+
 	# Add subdirs to /var/spool/pnp4nagios/ to prepare for different modes
 	mkdir debian/tmp/var/spool/pnp4nagios/nagios
 	mkdir debian/tmp/var/spool/pnp4nagios/npcd
@@ -161,6 +164,7 @@ binary-indep: build install
 	dh_installchangelogs -i ChangeLog
 	dh_installdocs -A -i AUTHORS README debian/README.Debian
 	dh_installexamples -i
+	dh_installdebconf -i
 	dh_installinit -i
 	dh_installman -i
 	dh_link -i
@@ -178,9 +182,10 @@ binary-arch: build install
 	dh_installchangelogs -a ChangeLog
 	dh_installdocs -A -a AUTHORS README debian/README.Debian
 	dh_installexamples -a
+	dh_installdebconf -a
 	dh_installinit -ppnp4nagios-bin --name=npcd
-	dh_installinit -a -Npnp4nagios-bin
-	dh_installman -a man/npcd.8
+	dh_installinit -ppnp4nagios-bin --name=pnp_gearman_worker
+	dh_installman -a
 	dh_link -a
 	dh_strip -a
 	dh_compress -a