diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2011-10-19 21:30:39 -0400 |
|---|---|---|
| committer | William Hubbs <williamh@gentoo.org> | 2011-10-20 14:32:37 -0500 |
| commit | 9a539ebbe1ee0c8557fbcdf22e849534dcbd9b53 (patch) | |
| tree | 9936901aa8c8231d49145894456ff6f40a74c0ae /conf.d | |
| parent | 9c77502f964ef368892598b4fb30c4909fe3d360 (diff) | |
further clean up OS differences in makefiles
No need for if() logic.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'conf.d')
| -rw-r--r-- | conf.d/Makefile | 27 | ||||
| -rw-r--r-- | conf.d/network.BSD.in (renamed from conf.d/network.BSD) | 0 | ||||
| -rw-r--r-- | conf.d/network.Linux.in (renamed from conf.d/network.Linux) | 0 | ||||
| -rw-r--r-- | conf.d/staticroute.BSD.in (renamed from conf.d/staticroute.BSD) | 0 | ||||
| -rw-r--r-- | conf.d/staticroute.Linux.in (renamed from conf.d/staticroute.Linux) | 0 |
5 files changed, 11 insertions, 16 deletions
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} $@ diff --git a/conf.d/network.BSD b/conf.d/network.BSD.in index 9f49b81a..9f49b81a 100644 --- a/conf.d/network.BSD +++ b/conf.d/network.BSD.in diff --git a/conf.d/network.Linux b/conf.d/network.Linux.in index f57ec91a..f57ec91a 100644 --- a/conf.d/network.Linux +++ b/conf.d/network.Linux.in diff --git a/conf.d/staticroute.BSD b/conf.d/staticroute.BSD.in index 47984733..47984733 100644 --- a/conf.d/staticroute.BSD +++ b/conf.d/staticroute.BSD.in diff --git a/conf.d/staticroute.Linux b/conf.d/staticroute.Linux.in index 68d22eb4..68d22eb4 100644 --- a/conf.d/staticroute.Linux +++ b/conf.d/staticroute.Linux.in |