[Pkg-nagios-changes] [pkg-nagios] r1677 - nagios-nrpe/trunk/debian

[Alexander Wirt]

Author: formorer
Date: 2009-07-06 06:07:21 +0000 (Mon, 06 Jul 2009)
New Revision: 1677

Modified:
   nagios-nrpe/trunk/debian/rules
Log:
Clean up rules file


Modified: nagios-nrpe/trunk/debian/rules
===================================================================
--- nagios-nrpe/trunk/debian/rules	2009-07-06 05:57:26 UTC (rev 1676)
+++ nagios-nrpe/trunk/debian/rules	2009-07-06 06:07:21 UTC (rev 1677)
@@ -17,19 +17,27 @@
 include /usr/share/dpatch/dpatch.make
 
 fix-configs: fix-configs-stamp
-fix-configs-stamp: patch-stamp
+fix-configs-stamp: configure-stamp
 	sed -e '/Last Modified/ d' sample-config/nrpe.cfg
 
+configure: configure-stamp 
+configure-stamp: 
+	dh_testdir
+	ln -sf /usr/share/misc/config.sub .
+	ln -sf /usr/share/misc/config.guess .
+	rm -f config.cache
+	./configure CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--libexecdir=/usr/lib/nagios/plugins \
+		--libdir=/usr/lib/nagios \
+		--enable-command-args
+	touch configure-stamp
+
 build: build-stamp
-build-stamp: patch-stamp
+build-stamp: patch-stamp configure-stamp 
 	dh_testdir
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-		cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-		cp -f /usr/share/misc/config.guess config.guess
-endif
-	./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/nagios/plugins --libdir=/usr/lib/nagios --enable-command-args
 	$(MAKE) all
 	touch build-stamp
 
@@ -39,13 +47,13 @@
 	if test -f Makefile; then $(MAKE) distclean; fi
 	dh_clean
 	rm -f config.sub config.guess
-	rm -f build-stamp install-stamp fix-configs-stamp
+	rm -f build-stamp install-stamp fix-configs-stamp configure-stamp
 
 install: install-stamp
 install-stamp: build-stamp fix-configs-stamp
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_clean 
 	dh_installdebconf
 	dh_installdirs
 	dh_installchangelogs Changelog
@@ -71,4 +79,4 @@
 	dh_md5sums
 	dh_builddeb
 
-.PHONY: binary binary-arch binary-indep clean install
+.PHONY: binary binary-arch binary-indep clean install configure