[pkg-dhcp-commits] [SCM] ISC DHCP packaging for Debian branch, master, updated. debian/4.2.2.dfsg.1-5-5-gc3cdc4c

[Andrew Pollock]

The following commit has been merged in the master branch:
commit d852b56ba53e9c79decfb6dd8cc84da3a05d65d6
Author: Andrew Pollock <apollock at debian.org>
Date:   Sat Jun 9 20:57:20 2012 -0700

    Do a clean between building LDAP and non-LDAP
    
    I had a build failure of the non-LDAP build because it picked up an
    LDAP-related .o file that was lying around from the LDAP build.
    
    So do an explicit clean between builds, but don't remove the LDAP-enabled
    binary in the clean target.
    
    This feels a bit hacky, but seems like the simplest thing to do for now.

diff --git a/debian/rules b/debian/rules
index a0b3778..a57e5ff 100755
--- a/debian/rules
+++ b/debian/rules
@@ -56,7 +56,7 @@ build-ldap-stamp:
 	
 build: build-arch build-indep
 
-build-arch: build-ldap-stamp build-non-ldap-stamp build-arch-stamp
+build-arch: build-ldap-stamp clean build-non-ldap-stamp build-arch-stamp
 build-indep:
 
 build-arch-stamp:
@@ -81,7 +81,6 @@ build-non-ldap-stamp:
 clean:
 	dh_testdir
 	rm -f build*stamp install*stamp
-	rm -Rf isc-dhcp-server-ldap
 
 	[ ! -f Makefile ] || $(MAKE) distclean
 	rm -f Makefile client/Makefile config.log config.status

-- 
ISC DHCP packaging for Debian