From: Roy Marples <roy@marples.name>
Date: Fri, 28 Mar 2008 13:16:04 +0000 (+0000)
Subject: Install INFODIR in the Makefile to reduce the dhcpcd code size.
X-Git-Tag: v4.0.2~527
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d57c77990a0222beff0cadf03d7455eb5c679d4;p=thirdparty%2Fdhcpcd.git

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

diff --git a/Makefile b/Makefile
index d6ac36c5..44466fd3 100644
--- 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 acc99f02..6da8fc5d 100644
--- 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 bb6b55d6..ce9be9bb 100644
--- 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 3f251db9..ba7de7c7 100644
--- 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 85d544a9..a9ff8e41 100644
--- 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