From 9a539ebbe1ee0c8557fbcdf22e849534dcbd9b53 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 19 Oct 2011 21:30:39 -0400 Subject: further clean up OS differences in makefiles No need for if() logic. Signed-off-by: Mike Frysinger --- conf.d/Makefile | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) (limited to 'conf.d/Makefile') diff --git a/conf.d/Makefile b/conf.d/Makefile index 5af2592b..d5f85c30 100644 --- a/conf.d/Makefile +++ b/conf.d/Makefile @@ -1,5 +1,6 @@ DIR= ${CONFDIR} -CONF= bootmisc fsck hostname localmount network staticroute urandom +CONF= bootmisc fsck hostname localmount network staticroute urandom \ + ${CONF-${OS}} TARGETS+= network staticroute CLEANFILES+= network staticroute @@ -7,22 +8,16 @@ CLEANFILES+= network staticroute MK= ../mk include ${MK}/os.mk -ifeq (${OS},FreeBSD) -CONF+= ipfw moused powerd rarpd savecore syscons -else ifeq (${OS},Linux) -CONF+= consolefont dmesg hwclock keymaps killprocs modules -SOS= Linux -else ifeq (${OS},NetBSD) -CONF+= moused rarpd savecore -endif +CONF-FreeBSD= ipfw moused powerd rarpd savecore syscons -include ${MK}/scripts.mk +CONF-Linux= consolefont dmesg hwclock keymaps killprocs modules + +CONF-NetBSD= moused rarpd savecore -SOS?= BSD +include ${MK}/scripts.mk -network: network.in network.${SOS} - cp $@.in $@ - [ -e $@.${SOS} ] && cat $@.${SOS} >> $@ || true +network: network.in network${SFX} + cat $^ > $@ -staticroute: staticroute.${SOS} - cp $@.${SOS} $@ +staticroute: staticroute${SFX} + cp $@${SFX} $@ -- cgit v1.2.3