emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make variable references in Makefiles consistent

Browse Source 
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:
William Hubbs 2011-10-19 12:22:23 -05:00
parent ecf77254bb
commit 9c77502f96
6 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
conf.d/Makefile
View File

@ -7,12 +7,12 @@ CLEANFILES+= network staticroute
MK= ../mk MK= ../mk
include ${MK}/os.mk include ${MK}/os.mk
ifeq ($(OS),FreeBSD) ifeq (${OS},FreeBSD)
CONF+= ipfw moused powerd rarpd savecore syscons CONF+= ipfw moused powerd rarpd savecore syscons
else ifeq ($(OS),Linux) else ifeq (${OS},Linux)
CONF+= consolefont dmesg hwclock keymaps killprocs modules CONF+= consolefont dmesg hwclock keymaps killprocs modules
SOS= Linux SOS= Linux
else ifeq ($(OS),NetBSD) else ifeq (${OS},NetBSD)
CONF+= moused rarpd savecore CONF+= moused rarpd savecore
endif endif

6
doc/Makefile
View File

@ -4,19 +4,19 @@ INC= net.example
MK= ../mk MK= ../mk
include ${MK}/os.mk include ${MK}/os.mk
ifeq ($(OS),FreeBSD) ifeq (${OS},FreeBSD)
SRCS+= net.example.in SRCS+= net.example.in
.SUFFIXES: .BSD.in .SUFFIXES: .BSD.in
.BSD.in: .BSD.in:
${CP} $< $@ ${CP} $< $@
else ifeq ($(OS),Linux) else ifeq (${OS},Linux)
SRCS+= net.example.in SRCS+= net.example.in
.SUFFIXES: .Linux.in .SUFFIXES: .Linux.in
.Linux.in: .Linux.in:
${CP} $< $@ ${CP} $< $@
else ifeq ($(OS),NetBSD) else ifeq (${OS},NetBSD)
SRCS+= net.example.in SRCS+= net.example.in
.SUFFIXES: .BSD.in .SUFFIXES: .BSD.in

8
etc/Makefile
View File

@ -6,15 +6,15 @@ CLEANFILES+= rc.conf
MK= ../mk MK= ../mk
include ${MK}/os.mk include ${MK}/os.mk
ifeq ($(OS),FreeBSD) ifeq (${OS},FreeBSD)
SED_EXTRA= -e 's:@TERM@:cons25:g' SED_EXTRA= -e 's:@TERM@:cons25:g'
SRCS+= rc.conf.in rc.in rc.shutdown.in SRCS+= rc.conf.in rc.in rc.shutdown.in
CONF+= devd.conf CONF+= devd.conf
BIN+= rc rc.shutdown rc.devd BIN+= rc rc.shutdown rc.devd
else ifeq ($(OS),Linux) else ifeq (${OS},Linux)
SED_EXTRA= -e 's:@TERM@:wsvt25:g' SED_EXTRA= -e 's:@TERM@:wsvt25:g'
SRCS+= rc.conf.in rc.in rc.shutdown.in SRCS+= rc.conf.in rc.in rc.shutdown.in
else ifeq ($(OS),NetBSD) else ifeq (${OS},NetBSD)
SED_EXTRA= -e 's:@TERM@:wsvt25:g' SED_EXTRA= -e 's:@TERM@:wsvt25:g'
SRCS+= rc.conf.in rc.in rc.shutdown.in SRCS+= rc.conf.in rc.in rc.shutdown.in
BIN+= rc rc.shutdown BIN+= rc rc.shutdown
@ -25,7 +25,7 @@ include ${MK}/scripts.mk
# We can't use "ifndef" here because that treats set-but-empty # We can't use "ifndef" here because that treats set-but-empty
# as not-set which is not what we want # as not-set which is not what we want
MKRCSYS ?= automagicplease MKRCSYS ?= automagicplease
ifeq ($(MKRCSYS),automagicplease) ifeq (${MKRCSYS},automagicplease)
# If the user isn't picking a default, then have the # If the user isn't picking a default, then have the
# config go with runtime automagic detection #357247 # config go with runtime automagic detection #357247
rc.conf: SED_EXTRA += -e '/^rc_sys=""/s:^:\#:' rc.conf: SED_EXTRA += -e '/^rc_sys=""/s:^:\#:'

6
net/Makefile
View File

@ -6,14 +6,14 @@ INC= dhclient.sh dhcpcd.sh ifconfig.sh macchanger.sh macnet.sh \
MK= ../mk MK= ../mk
include ${MK}/os.mk include ${MK}/os.mk
ifeq ($(OS),FreeBSD) ifeq (${OS},FreeBSD)
SRCS+= iwconfig.sh.in SRCS+= iwconfig.sh.in
INC+= iwconfig.sh INC+= iwconfig.sh
.SUFFIXES: .sh.BSD.in .SUFFIXES: .sh.BSD.in
.sh.BSD.in.sh: .sh.BSD.in.sh:
${CP} $< $@ ${CP} $< $@
else ifeq ($(OS),Linux) else ifeq (${OS},Linux)
SRCS+= iwconfig.sh.in SRCS+= iwconfig.sh.in
INC+= adsl.sh apipa.sh arping.sh bonding.sh br2684ctl.sh bridge.sh \ 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 \ 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 .SUFFIXES: .sh.Linux.in
.sh.Linux.in.sh: .sh.Linux.in.sh:
${CP} $< $@ ${CP} $< $@
else ifeq ($(OS),NetBSD) else ifeq (${OS},NetBSD)
INC+= ifwatchd.sh INC+= ifwatchd.sh
.SUFFIXES: .sh.BSD.in .SUFFIXES: .sh.BSD.in

8
runlevels/Makefile
View File

@ -16,19 +16,19 @@ include ${MK}/sys.mk
include ${MK}/os.mk include ${MK}/os.mk
include ${MK}/gitignore.mk include ${MK}/gitignore.mk
ifeq ($(OS),BSD) ifeq (${OS},BSD)
BOOT+= hostid newsyslog savecore syslogd swap-blk BOOT+= hostid newsyslog savecore syslogd swap-blk
else ifeq ($(OS),FreeBSD) else ifeq (${OS},FreeBSD)
# Generic BSD stuff # Generic BSD stuff
BOOT+= hostid net.lo0 newsyslog savecore syslogd BOOT+= hostid net.lo0 newsyslog savecore syslogd
# FreeBSD specific stuff # FreeBSD specific stuff
BOOT+= adjkerntz dumpon syscons BOOT+= adjkerntz dumpon syscons
else ifeq ($(OS),Linux) else ifeq (${OS},Linux)
SYSINIT+= devfs dmesg SYSINIT+= devfs dmesg
BOOT+= hwclock keymaps modules mtab procfs termencoding BOOT+= hwclock keymaps modules mtab procfs termencoding
SHUTDOWN+= killprocs mount-ro SHUTDOWN+= killprocs mount-ro
else ifeq ($(OS),NetBSD) else ifeq (${OS},NetBSD)
# Generic BSD stuff # Generic BSD stuff
BOOT+= hostid net.lo0 newsyslog savecore syslogd BOOT+= hostid net.lo0 newsyslog savecore syslogd

6
sh/Makefile
View File

@ -9,14 +9,14 @@ INSTALLAFTER= _installafter
MK= ../mk MK= ../mk
include ${MK}/os.mk include ${MK}/os.mk
ifeq ($(OS),FreeBSD) ifeq (${OS},FreeBSD)
SRCS+= init.sh.in SRCS+= init.sh.in
.SUFFIXES: .sh.BSD.in .SUFFIXES: .sh.BSD.in
.sh.BSD.in.sh: .sh.BSD.in.sh:
${SED} ${SED_REPLACE} ${SED_EXTRA} $< > $@ ${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 SRCS+= init.sh.in init-early.sh.in udhcpc-hook.sh.in
BIN+= init-early.sh udhcpc-hook.sh BIN+= init-early.sh udhcpc-hook.sh
@ -24,7 +24,7 @@ BIN+= init-early.sh udhcpc-hook.sh
.sh.Linux.in.sh: .sh.Linux.in.sh:
${SED} ${SED_REPLACE} ${SED_EXTRA} $< > $@ ${SED} ${SED_REPLACE} ${SED_EXTRA} $< > $@
else ifeq ($(OS),NetBSD) else ifeq (${OS},NetBSD)
SRCS+= init.sh.in SRCS+= init.sh.in
SRCS+= ifwatchd-carrier.sh.in ifwatchd-nocarrier.sh.in SRCS+= ifwatchd-carrier.sh.in ifwatchd-nocarrier.sh.in