[pkg-dhcp-commits] [SCM] ISC DHCP packaging for Debian branch, master, updated. debian/4.1.0-1-15-g39c6fcb

[Andrew Pollock]

The following commit has been merged in the master branch:
commit 3021ea7da8d830c36bb9e8df285b876e69fc18cb
Author: Andrew Pollock <apollock at icarus.andrew.net.au>
Date:   Sun Jul 12 18:12:28 2009 -0700

    Try another way of passing in the defines for file locations

diff --git a/debian/rules b/debian/rules
index 96b2da6..341e275 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,7 +32,7 @@ else
 CFLAGS += -O2
 endif
 
-BVARS = PREDEFINES='-D_PATH_DHCPD_DB=\"/var/lib/dhcp/dhcpd.leases\" \
+CFLAGS += '-D_PATH_DHCPD_DB=\"/var/lib/dhcp/dhcpd.leases\" \
         -D_PATH_DHCLIENT_DB=\"/var/lib/dhcp/dhclient.leases\" \
         -D_PATH_DHCLIENT_SCRIPT=\"/sbin/dhclient-script\" \
         -D_PATH_DHCPD_CONF=\"/etc/dhcp/dhcpd.conf\" \
@@ -47,7 +47,7 @@ build-stamp: patch-stamp
 		--sysconfdir=$(DESTDIR)/etc/dhcp \
 		--disable-dhcpv6 
 	
-	$(MAKE) $(BVARS) $(CROSS)
+	$(MAKE) $(CROSS)
 
 	touch build-stamp
 

-- 
ISC DHCP packaging for Debian