summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2019-11-28 11:47:29 +0000
committerRoy Marples <roy@marples.name>2019-11-28 11:47:29 +0000
commit49e5ee5eee0f685600d8f6c5fc6cffa26833865d (patch)
treec37f816f514f84750e850a68bf17ca20c06df01d /configure
parenta02945804fbc73abba2657bf45d70d210022fd01 (diff)
downloaddhcpcd-49e5ee5eee0f685600d8f6c5fc6cffa26833865d.tar.xz
build: Move rundir from /var/run to /var/run/dhcpcd
This will allow dhcpcd to create and unlink pidfiles and sockets which it could otherwise not if dropped priviledges. Downstream packages such as dhcpcd-ui will need to be adjusted.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure8
1 files changed, 5 insertions, 3 deletions
diff --git a/configure b/configure
index 9efa1638..54a9b791 100755
--- a/configure
+++ b/configure
@@ -71,7 +71,8 @@ for x do
--libexecdir) LIBEXECDIR=$var;;
--statedir|--localstatedir) STATEDIR=$var;;
--dbdir) DBDIR=$var;;
- --rundir|--runstatedir) RUNDIR=$var;;
+ --rundir) RUNDIR=$var;;
+ --runstatedir) RUNSTATEDIR=$var;;
--mandir) MANDIR=$var;;
--datadir) DATADIR=$var;;
--with-ccopts|CFLAGS) CFLAGS=$var;;
@@ -253,7 +254,8 @@ echo "/* $OS */" >$CONFIG_H
: ${LIBEXECDIR:=$PREFIX/libexec}
: ${STATEDIR:=/var}
: ${DBDIR:=$STATEDIR/db/dhcpcd}
-: ${RUNDIR:=$STATEDIR/run}
+: ${RUNSTATEDIR:=$STATEDIR/run}
+: ${RUNDIR:=$RUNSTATEDIR/dhcpcd}
: ${MANDIR:=${PREFIX:-/usr}/share/man}
: ${DATADIR:=${PREFIX:-/usr}/share}
@@ -506,7 +508,7 @@ if [ -z "$INET" -o "$INET" = yes ]; then
echo "DHCPCD_SRCS+= ipv4ll.c" >>$CONFIG_MK
fi
fi
-if [ -z "$INET6" -o "$INET6" = yes ]; then
+if [ -z "$INET6" ] || [ "$INET6" = yes ]; then
echo "Enabling INET6 support"
echo "CPPFLAGS+= -DINET6" >>$CONFIG_MK
echo "DHCPCD_SRCS+= ipv6.c ipv6nd.c" >>$CONFIG_MK