From: Roy Marples <roy@marples.name>
Date: Tue, 20 May 2008 22:25:20 +0000 (+0000)
Subject: Move socket.c -> lpf.c. Also, default Linux to using /lib/dhcpcd rather than /libexec... 
X-Git-Tag: v4.0.2~362
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9e13256b0ea98a62e21205b4d0f565d34e4468b;p=thirdparty%2Fdhcpcd.git

Move socket.c -> lpf.c. Also, default Linux to using /lib/dhcpcd rather than /libexec so it fits the FHS better.
---

diff --git a/Makefile b/Makefile
index ed66faaa..525ad8c8 100644
--- a/Makefile
+++ b/Makefile
@@ -5,13 +5,14 @@
 PROG=		dhcpcd
 SRCS=		common.c dhcp.c dhcpcd.c logger.c net.c signals.c
 SRCS+=		configure.c client.c
-SRCS+=		${SRC_IF} ${SRC_SOCKET}
+SRCS+=		${SRC_IF} ${SRC_PF}
 
 SCRIPTDIR=	${PREFIX}/libexec
 SCRIPT=		${SCRIPTDIR}/dhcpcd.sh
 HOOKDIR=	${SCRIPTDIR}/dhcpcd.hook.d
 
 BINDIR=		${PREFIX}/sbin
+DBDIR=		/var/db
 SYSCONFDIR?=	${PREFIX}/etc
 
 MAN=		dhcpcd.conf.5 dhcpcd.8 dhcpcd.sh.8
diff --git a/socket.c b/lpf.c
similarity index 100%
rename from socket.c
rename to lpf.c
diff --git a/mk/os-BSD.mk b/mk/os-BSD.mk
index 83064571..f9d33975 100644
--- a/mk/os-BSD.mk
+++ b/mk/os-BSD.mk
@@ -1,7 +1,5 @@
 # Setup OS specific variables
 # Copyright 2008 Roy Marples <roy@marples.name>
 
-SRC_SOCKET=	bpf.c
+SRC_PF=		bpf.c
 SRC_IF=		if-bsd.c
-
-DBDIR=		/var/db
diff --git a/mk/os-Linux.mk b/mk/os-Linux.mk
index 32c48081..4c662535 100644
--- a/mk/os-Linux.mk
+++ b/mk/os-Linux.mk
@@ -1,12 +1,15 @@
 # Setup OS specific variables
 # Copyright 2008 Roy Marples <roy@marples.name>
 
-SRC_SOCKET=	socket.c
+SRC_PF=		lpf.c
 SRC_IF=		if-linux.c
 
 CFLAGS+=	-D_BSD_SOURCE -D_XOPEN_SOURCE=600
 LIBRT=		-lrt
+
+# Satisfy FHS
 DBDIR=		/var/lib/dhcpcd
+SCRIPTDIR=	${PREFIX}/lib/dhcpcd
 
 # Work out if our fork() works or not
 _HAVE_FORK_SH= if test "${HAVE_FORK}" = "yes"; then \