From: Roy Marples <roy@marples.name>
Date: Wed, 21 May 2008 08:43:28 +0000 (+0000)
Subject: Stop defining the same flags twice.
X-Git-Tag: v4.0.2~353
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d46cd932b092dcf0266dd5c6c3bfa4ec090c48cd;p=thirdparty%2Fdhcpcd.git

Stop defining the same flags twice.
---

diff --git a/Makefile b/Makefile
index 525ad8c8..d245848e 100644
--- a/Makefile
+++ b/Makefile
@@ -46,4 +46,6 @@ SED_SYS=	-e 's:@SYSCONFDIR@:${SYSCONFDIR}:g'
 	${SED} ${SED_HOOKDIR} ${SED_SCRIPT} ${SED_SYS} $< > $@
 
 MK=		mk
+include ${MK}/os.mk
+include ${MK}/sys.mk
 include ${MK}/prog.mk
diff --git a/hook.d/Makefile b/hook.d/Makefile
index ced12df1..8d33eed4 100644
--- a/hook.d/Makefile
+++ b/hook.d/Makefile
@@ -5,5 +5,7 @@ SCRIPTS=	${SYSTEMSCRIPTS} ${HOOKSCRIPTS}
 SCRIPTSDIR=	${HOOKDIR}
 
 MK=		../mk
+include ${MK}/os.mk
+include ${MK}/sys.mk
 include ${MK}/scripts.mk
 install: _scriptsinstall
diff --git a/mk/os-Linux.mk b/mk/os-Linux.mk
index af3c16ad..0fc57ba9 100644
--- a/mk/os-Linux.mk
+++ b/mk/os-Linux.mk
@@ -27,4 +27,4 @@ _HAVE_FORK_SH= if test "${HAVE_FORK}" = "yes"; then \
 		rm -f .fork.c .fork; \
 	fi;
 _HAVE_FORK!=	${_HAVE_FORK_SH}
-CFLAGS+=	${_HAVE_FORK}$(shell ${_HAVE_FORK_SH})
+CPPFLAGS+=	${_HAVE_FORK}$(shell ${_HAVE_FORK_SH})
diff --git a/mk/prog.mk b/mk/prog.mk
index 5cfc1282..385767d8 100644
--- a/mk/prog.mk
+++ b/mk/prog.mk
@@ -4,8 +4,6 @@
 # Copyright 2008 Roy Marples <roy@marples.name>
 
 include ${MK}/cc.mk
-include ${MK}/os.mk
-include ${MK}/sys.mk
 
 OBJS+=		${SRCS:.c=.o}
 
diff --git a/mk/scripts.mk b/mk/scripts.mk
index b33ec181..d295163c 100644
--- a/mk/scripts.mk
+++ b/mk/scripts.mk
@@ -1,9 +1,6 @@
 # Quick and dirty scripts
 # Copyright 2008 Roy Marples <roy@marples.name>
 
-include ${MK}/os.mk
-include ${MK}/sys.mk
-
 SCRIPTSDIR?=	${BINDIR}
 SCRIPTSMODE?=	${BINMODE}