dhcp/dhcp-3.1.1-paths.dif

--- includes/cf/linux.h
+++ includes/cf/linux.h	2008/09/08 09:56:54
@@ -75,7 +75,7 @@ extern int h_errno;
 
 #include <sys/time.h>		/* gettimeofday()*/
 
-/* Databases go in /var/state/dhcp.   It would also be valid to put them
+/* Databases go in /var/lib/dhcp.   It would also be valid to put them
    in /var/state/misc - indeed, given that there's only one lease file, it
    would probably be better.   However, I have some ideas for optimizing
    the lease database that may result in a _lot_ of smaller files being
@@ -83,11 +83,11 @@ extern int h_errno;
    directory. */
 
 #ifndef _PATH_DHCPD_DB
-#define _PATH_DHCPD_DB		"/var/state/dhcp/dhcpd.leases"
+#define _PATH_DHCPD_DB		"/var/lib/dhcp/db/dhcpd.leases"
 #endif
 
 #ifndef _PATH_DHCLIENT_DB
-#define _PATH_DHCLIENT_DB	"/var/state/dhcp/dhclient.leases"
+#define _PATH_DHCLIENT_DB	"/var/lib/dhcp/dhclient.leases"
 #endif
 
 /* Varargs stuff... */
--- includes/dhcpd.h
+++ includes/dhcpd.h	2008/09/08 09:56:54
@@ -1062,7 +1062,7 @@ typedef unsigned char option_mask [16];
 #endif
 
 #ifndef _PATH_DHCPD_DB
-#define _PATH_DHCPD_DB		"/etc/dhcpd.leases"
+#define _PATH_DHCPD_DB		"/var/lib/dhcp/db/dhcpd.leases"
 #endif
 
 #ifndef _PATH_DHCPD_PID
@@ -1083,7 +1083,7 @@ typedef unsigned char option_mask [16];
 #endif
 
 #ifndef _PATH_DHCLIENT_DB
-#define _PATH_DHCLIENT_DB	"/etc/dhclient.leases"
+#define _PATH_DHCLIENT_DB	"/var/run/dhclient.leases"
 #endif
 
 #ifndef _PATH_RESOLV_CONF
--- Makefile.conf
+++ Makefile.conf	2008/09/08 09:56:58
@@ -42,8 +42,10 @@ CATMANPAGES =
 ETC = /etc
 VARRUN = /var/run
 VARDB = /var/db
-LIBDIR=/usr/local/lib
-INCDIR=/usr/local/include
+ifeq (${LIBDIR},)
+LIBDIR=/usr/lib
+endif
+INCDIR=/usr/include
 LIBS =
 COPTS = $(BINDDEF) $(CC_OPTIONS)
 DEBUG = -g
@@ -277,17 +279,17 @@ MINORVERSION=MinorVersion
 #COPTS = -DLINUX_MAJOR=$(MAJORVERSION) -DLINUX_MINOR=$(MINORVERSION) \
 #        $(BINDDEF) $(CC_OPTIONS)
 #CF = cf/linux.h
-#ADMMANDIR = /usr/man/man8
+#ADMMANDIR = /usr/share/man/man8
 #ADMMANEXT = .8
-#FFMANDIR = /usr/man/man5
+#FFMANDIR = /usr/share/man/man5
 #FFMANEXT = .5
-#LIBMANDIR = /usr/man/man3
+#LIBMANDIR = /usr/share/man/man3
 #LIBMANEXT = .3
-#USRMANDIR = /usr/man/man1
+#USRMANDIR = /usr/share/man/man1
 #USRMANEXT = .1
 #MANCAT = man
 #VARRUN = /var/run
-#VARDB = /var/state/dhcp
+#VARDB = /var/lib/dhcp
 #SCRIPT=linux
 ##--linux-2.0--
 
@@ -296,17 +298,17 @@ MINORVERSION=MinorVersion
 #COPTS = -DLINUX_MAJOR=$(MAJORVERSION) -DLINUX_MINOR=$(MINORVERSION) \
 #        $(BINDDEF) $(CC_OPTIONS)
 #CF = cf/linux.h
-#ADMMANDIR = /usr/man/man8
+#ADMMANDIR = /usr/share/man/man8
 #ADMMANEXT = .8
-#FFMANDIR = /usr/man/man5
+#FFMANDIR = /usr/share/man/man5
 #FFMANEXT = .5
-#LIBMANDIR = /usr/man/man3
+#LIBMANDIR = /usr/share/man/man3
 #LIBMANEXT = .3
-#USRMANDIR = /usr/man/man1
+#USRMANDIR = /usr/share/man/man1
 #USRMANEXT = .1
 #MANCAT = man
 #VARRUN = /var/run
-#VARDB = /var/state/dhcp
+#VARDB = /var/lib/dhcp
 #SCRIPT=linux
 ##--linux-2.1--
 
@@ -315,20 +317,36 @@ MINORVERSION=MinorVersion
 #COPTS = -DLINUX_MAJOR=$(MAJORVERSION) -DLINUX_MINOR=$(MINORVERSION) \
 #        $(BINDDEF) $(CC_OPTIONS)
 #CF = cf/linux.h
-#ADMMANDIR = /usr/man/man8
+#ADMMANDIR = /usr/share/man/man8
 #ADMMANEXT = .8
-#FFMANDIR = /usr/man/man5
+#FFMANDIR = /usr/share/man/man5
 #FFMANEXT = .5
-#LIBMANDIR = /usr/man/man3
+#LIBMANDIR = /usr/share/man/man3
 #LIBMANEXT = .3
-#USRMANDIR = /usr/man/man1
+#USRMANDIR = /usr/share/man/man1
 #USRMANEXT = .1
 #MANCAT = man
 #VARRUN = /var/run
-#VARDB = /var/state/dhcp
+#VARDB = /var/lib/dhcp
 #SCRIPT=linux
 ##--linux-2.2--
 
+## Linux 2.4
+##--linux-2.4--
+#COPTS = -DLINUX_MAJOR=$(MAJORVERSION) -DLINUX_MINOR=$(MINORVERSION) $(BINDDEF)
+#CF = cf/linux.h
+#ADMMANDIR = /usr/share/man/man8
+#ADMMANEXT = .8
+#FFMANDIR = /usr/share/man/man5
+#FFMANEXT = .5
+#LIBMANDIR = /usr/share/man/man3
+#LIBMANEXT = .3
+#MANCAT = man
+#VARRUN = /var/run
+#VARDB = /var/lib/dhcp
+#SCRIPT=linux
+##--linux-2.4--
+ 
 ## SCO UnixWare 7
 ##--uw7--
 #CF = cf/uw7.h