aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf.d/Makefile6
-rw-r--r--doc/Makefile6
-rw-r--r--etc/Makefile8
-rw-r--r--net/Makefile6
-rw-r--r--runlevels/Makefile8
-rw-r--r--sh/Makefile6
6 files changed, 20 insertions, 20 deletions
diff --git a/conf.d/Makefile b/conf.d/Makefile
index 817f60e2..5af2592b 100644
--- a/conf.d/Makefile
+++ b/conf.d/Makefile
@@ -7,12 +7,12 @@ CLEANFILES+= network staticroute
MK= ../mk
include ${MK}/os.mk
-ifeq ($(OS),FreeBSD)
+ifeq (${OS},FreeBSD)
CONF+= ipfw moused powerd rarpd savecore syscons
-else ifeq ($(OS),Linux)
+else ifeq (${OS},Linux)
CONF+= consolefont dmesg hwclock keymaps killprocs modules
SOS= Linux
-else ifeq ($(OS),NetBSD)
+else ifeq (${OS},NetBSD)
CONF+= moused rarpd savecore
endif
diff --git a/doc/Makefile b/doc/Makefile
index 8f6930a2..4fbc99ce 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -4,19 +4,19 @@ INC= net.example
MK= ../mk
include ${MK}/os.mk
-ifeq ($(OS),FreeBSD)
+ifeq (${OS},FreeBSD)
SRCS+= net.example.in
.SUFFIXES: .BSD.in
.BSD.in:
${CP} $< $@
-else ifeq ($(OS),Linux)
+else ifeq (${OS},Linux)
SRCS+= net.example.in
.SUFFIXES: .Linux.in
.Linux.in:
${CP} $< $@
-else ifeq ($(OS),NetBSD)
+else ifeq (${OS},NetBSD)
SRCS+= net.example.in
.SUFFIXES: .BSD.in
diff --git a/etc/Makefile b/etc/Makefile
index 4f913add..a7976b6a 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -6,15 +6,15 @@ CLEANFILES+= rc.conf
MK= ../mk
include ${MK}/os.mk
-ifeq ($(OS),FreeBSD)
+ifeq (${OS},FreeBSD)
SED_EXTRA= -e 's:@TERM@:cons25:g'
SRCS+= rc.conf.in rc.in rc.shutdown.in
CONF+= devd.conf
BIN+= rc rc.shutdown rc.devd
-else ifeq ($(OS),Linux)
+else ifeq (${OS},Linux)
SED_EXTRA= -e 's:@TERM@:wsvt25:g'
SRCS+= rc.conf.in rc.in rc.shutdown.in
-else ifeq ($(OS),NetBSD)
+else ifeq (${OS},NetBSD)
SED_EXTRA= -e 's:@TERM@:wsvt25:g'
SRCS+= rc.conf.in rc.in rc.shutdown.in
BIN+= rc rc.shutdown
@@ -25,7 +25,7 @@ include ${MK}/scripts.mk
# We can't use "ifndef" here because that treats set-but-empty
# as not-set which is not what we want
MKRCSYS ?= automagicplease
-ifeq ($(MKRCSYS),automagicplease)
+ifeq (${MKRCSYS},automagicplease)
# If the user isn't picking a default, then have the
# config go with runtime automagic detection #357247
rc.conf: SED_EXTRA += -e '/^rc_sys=""/s:^:\#:'
diff --git a/net/Makefile b/net/Makefile
index af5f6e2e..f783e40a 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -6,14 +6,14 @@ INC= dhclient.sh dhcpcd.sh ifconfig.sh macchanger.sh macnet.sh \
MK= ../mk
include ${MK}/os.mk
-ifeq ($(OS),FreeBSD)
+ifeq (${OS},FreeBSD)
SRCS+= iwconfig.sh.in
INC+= iwconfig.sh
.SUFFIXES: .sh.BSD.in
.sh.BSD.in.sh:
${CP} $< $@
-else ifeq ($(OS),Linux)
+else ifeq (${OS},Linux)
SRCS+= iwconfig.sh.in
INC+= adsl.sh apipa.sh arping.sh bonding.sh br2684ctl.sh bridge.sh \
ccwgroup.sh clip.sh ethtool.sh iproute2.sh ifplugd.sh ip6to4.sh \
@@ -23,7 +23,7 @@ INC+= adsl.sh apipa.sh arping.sh bonding.sh br2684ctl.sh bridge.sh \
.SUFFIXES: .sh.Linux.in
.sh.Linux.in.sh:
${CP} $< $@
-else ifeq ($(OS),NetBSD)
+else ifeq (${OS},NetBSD)
INC+= ifwatchd.sh
.SUFFIXES: .sh.BSD.in
diff --git a/runlevels/Makefile b/runlevels/Makefile
index 782638b2..1f9f9aaf 100644
--- a/runlevels/Makefile
+++ b/runlevels/Makefile
@@ -16,19 +16,19 @@ include ${MK}/sys.mk
include ${MK}/os.mk
include ${MK}/gitignore.mk
-ifeq ($(OS),BSD)
+ifeq (${OS},BSD)
BOOT+= hostid newsyslog savecore syslogd swap-blk
-else ifeq ($(OS),FreeBSD)
+else ifeq (${OS},FreeBSD)
# Generic BSD stuff
BOOT+= hostid net.lo0 newsyslog savecore syslogd
# FreeBSD specific stuff
BOOT+= adjkerntz dumpon syscons
-else ifeq ($(OS),Linux)
+else ifeq (${OS},Linux)
SYSINIT+= devfs dmesg
BOOT+= hwclock keymaps modules mtab procfs termencoding
SHUTDOWN+= killprocs mount-ro
-else ifeq ($(OS),NetBSD)
+else ifeq (${OS},NetBSD)
# Generic BSD stuff
BOOT+= hostid net.lo0 newsyslog savecore syslogd
diff --git a/sh/Makefile b/sh/Makefile
index 72df96a5..c29462e3 100644
--- a/sh/Makefile
+++ b/sh/Makefile
@@ -9,14 +9,14 @@ INSTALLAFTER= _installafter
MK= ../mk
include ${MK}/os.mk
-ifeq ($(OS),FreeBSD)
+ifeq (${OS},FreeBSD)
SRCS+= init.sh.in
.SUFFIXES: .sh.BSD.in
.sh.BSD.in.sh:
${SED} ${SED_REPLACE} ${SED_EXTRA} $< > $@
-else ifeq ($(OS),Linux)
+else ifeq (${OS},Linux)
SRCS+= init.sh.in init-early.sh.in udhcpc-hook.sh.in
BIN+= init-early.sh udhcpc-hook.sh
@@ -24,7 +24,7 @@ BIN+= init-early.sh udhcpc-hook.sh
.sh.Linux.in.sh:
${SED} ${SED_REPLACE} ${SED_EXTRA} $< > $@
-else ifeq ($(OS),NetBSD)
+else ifeq (${OS},NetBSD)
SRCS+= init.sh.in
SRCS+= ifwatchd-carrier.sh.in ifwatchd-nocarrier.sh.in