Move socket.c -> lpf.c. Also, default Linux to using /lib/dhcpcd rather than /libexec...

diff --git a/Makefile b/Makefile
index ed66faaa899b99b36678c2ac08685baef4af2cb1..525ad8c878147720fe607b0bed8b1d54e9de8ac1 100644 (file)
--- 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 83064571d5e93e06104ca35e98223707538c5c6c..f9d3397508552a55f2a613505c0c24f86ac7bf29 100644 (file)
--- 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 32c480812456e95341f812f4f40ae80b0bbc77e2..4c66253558bc4fd51c6fd89e6530633fe5cd0532 100644 (file)
--- 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 \