Stop defining the same flags twice.

diff --git a/Makefile b/Makefile
index 525ad8c878147720fe607b0bed8b1d54e9de8ac1..d245848e74d859ef811d6325f44810f96adacdc0 100644 (file)
--- 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 ced12df1f5554b808a9eee8d79674137de92dc7e..8d33eed4703dc3bb35561a0f25e791ed9d8cb503 100644 (file)
--- 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 af3c16ad5371c5ecc735c5ecd2ed51df74380722..0fc57ba91ac078cb16e9771f3ab3c2b864f72820 100644 (file)
--- 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 5cfc128221aecc017496a5b1b300b56091ec621d..385767d8fe72829d2a7cb94898597ee75cd32f28 100644 (file)
--- 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 b33ec1812ddb9aa8d1a7e55533483d365e74cfc5..d295163ce058280261471ad03bb0db866dc31c20 100644 (file)
--- 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}