Install INFODIR in the Makefile to reduce the dhcpcd code size.

diff --git a/Makefile b/Makefile
index d6ac36c592279d814bfc3498b7de8a7d170f4094..44466fd3c39aeec7f17349a4ee99ed5f1d13caab 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -30,6 +30,7 @@ CFLAGS+=      ${_RC}$(shell ${_RC_SH})
 MK=            mk
 include ${MK}/prog.mk
 
+CFLAGS+=       -DINFODIR=\"${INFODIR}\"
 LDADD+=                ${LIBRESOLV} ${LIBRT}
 
 # As version.h is generated by us, hardcode the depend correctly.
@@ -38,4 +39,4 @@ version.h:
        echo "#define VERSION \"${VERSION}\""> version.h
 
 .in:
-       sed 's:@PREFIX@:${PREFIX}:g; s:@INFODIR@:${INFOD}:g' $< > $@
+       ${SED} 's:@PREFIX@:${PREFIX}:g; s:@INFODIR@:${INFODIR}:g' $< > $@

diff --git a/dhcpcd.c b/dhcpcd.c
index acc99f027d3973a9054bd885605bb2e7466e260b..6da8fc5d9131fd791b4744792447092a96540917 100644 (file)
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -29,7 +29,6 @@ const char copyright[] = "Copyright (c) 2006-2008 Roy Marples";
 
 #include <sys/file.h>
 #include <sys/types.h>
-#include <sys/stat.h>
 
 #include <arpa/inet.h>
 
@@ -530,15 +529,6 @@ main(int argc, char **argv)
        chdir("/");
        umask(022);
 
-       if (mkdir(INFODIR, S_IRUSR | S_IWUSR |S_IXUSR | S_IRGRP | S_IXGRP
-                 | S_IROTH | S_IXOTH) &&
-           errno != EEXIST)
-       {
-               logger(LOG_ERR, "mkdir(\"%s\",0): %s\n",
-                      INFODIR, strerror(errno));
-               goto abort;
-       }
-
        if (options->test) {
                if (options->dorequest || options->doinform) {
                        logger(LOG_ERR,

diff --git a/mk/os-BSD.mk b/mk/os-BSD.mk
index bb6b55d64b209d3a3e9481b165956f4c91f1de62..ce9be9bbb098515594716de1f9eb377bae5a8ab2 100644 (file)
--- a/mk/os-BSD.mk
+++ b/mk/os-BSD.mk
@@ -3,3 +3,5 @@
 
 SRC_SOCKET=    bpf.c
 SRC_IF=                if-bsd.c
+
+INFODIR?=      /var/db

diff --git a/mk/os-Linux.mk b/mk/os-Linux.mk
index 3f251db988cb48c77defb44c14335fa7c5c31876..ba7de7c781d2a3d93a303c999463a1a50af06a92 100644 (file)
--- a/mk/os-Linux.mk
+++ b/mk/os-Linux.mk
@@ -27,3 +27,5 @@ _HAVE_FORK_SH= if test "${HAVE_FORK}" = "yes"; then \
 _HAVE_FORK!=   ${_HAVE_FORK_SH}
 CFLAGS+=       ${_HAVE_FORK}$(shell ${_HAVE_FORK_SH})
 
+_install_infodir:
+       ${INSTALL} -d ${DESTDIR}/var/

diff --git a/mk/prog.mk b/mk/prog.mk
index 85d544a906f5408d55c3caedfc14621abab2fcd7..a9ff8e417b0a8c2d494a07d9ea05e7d7f0861363 100644 (file)
--- a/mk/prog.mk
+++ b/mk/prog.mk
@@ -11,6 +11,7 @@ BINMODE?=     0755
 OBJS+=         ${SRCS:.c=.o}
 
 INSTALL?=      install
+SED?=          sed
 
 all: ${PROG} ${MAN}
 
@@ -28,6 +29,7 @@ ${PROG}: ${SCRIPTS} ${OBJS}
 _proginstall: ${PROG}
        ${INSTALL} -d ${DESTDIR}${BINDIR}
        ${INSTALL} -m ${BINMODE} ${PROG} ${DESTDIR}${BINDIR}
+       ${INSTALL} -d ${DESTDIR}${INFODIR}
 
 include ${MK}/depend.mk
 include ${MK}/man.mk