Make variable references in Makefiles consistent
Some variable references were written as $(foo), but the majority were written as ${foo}. This commit changes all of the variable references to using braces.
This commit is contained in:
parent
ecf77254bb
commit
9c77502f96
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
@ -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:^:\#:'
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user