use $CP and $SED instead of cp and sed
This commit is contained in:
parent
ccf238f852
commit
833903fc78
@ -2,4 +2,4 @@ SRCS+= net.example.in
|
||||
|
||||
.SUFFIXES: .BSD.in
|
||||
.BSD.in:
|
||||
sed ${SED_REPLACE} ${SED_EXTRA} $< > $@
|
||||
${CP} $< $@
|
||||
|
@ -2,4 +2,4 @@ SRCS+= net.example.in
|
||||
|
||||
.SUFFIXES: .Linux.in
|
||||
.Linux.in:
|
||||
sed ${SED_REPLACE} ${SED_EXTRA} $< > $@
|
||||
${CP} $< $@
|
||||
|
@ -2,4 +2,4 @@ SRCS+= net.example.in
|
||||
|
||||
.SUFFIXES: .BSD.in
|
||||
.BSD.in:
|
||||
sed ${SED_REPLACE} ${SED_EXTRA} $< > $@
|
||||
${CP} $< $@
|
||||
|
@ -16,10 +16,10 @@ SED_REPLACE= -e 's:@SHELL@:${SH}:g' -e 's:@LIB@:${LIBNAME}:g' -e 's:@SYSCONFDIR
|
||||
# Tweak our shell scripts
|
||||
.SUFFIXES: .sh.in .in
|
||||
.sh.in.sh:
|
||||
sed ${SED_REPLACE} ${SED_EXTRA} $< > $@
|
||||
${SED} ${SED_REPLACE} ${SED_EXTRA} $< > $@
|
||||
|
||||
.in:
|
||||
sed ${SED_REPLACE} ${SED_EXTRA} $< > $@
|
||||
${SED} ${SED_REPLACE} ${SED_EXTRA} $< > $@
|
||||
|
||||
all: ${OBJS}
|
||||
|
||||
|
14
mk/subdir.mk
14
mk/subdir.mk
@ -12,20 +12,6 @@ _SUBDIR = @${_+_}for x in ${SUBDIR}; do \
|
||||
DIRPRFX=${DIRPRFX}$$x/ || exit $$?; \
|
||||
cd ..; \
|
||||
fi; \
|
||||
if test -d $$x.${OS}; then \
|
||||
${ECHODIR} "===> ${DIRPRFX}$$x.${OS} (${@:realinstall=install})"; \
|
||||
cd $$x.${OS}; \
|
||||
${MAKE} ${@:realinstall=install} \
|
||||
DIRPRFX=${DIRPRFX}$$x.${OS}/ || exit $$?; \
|
||||
cd ..; \
|
||||
fi; \
|
||||
if test "${SUBOS}" != "${OS}" && test -d $$x.${SUBOS}; then \
|
||||
${ECHODIR} "===> ${DIRPRFX}$$x.${SUBOS} (${@:realinstall=install})"; \
|
||||
cd $$x.${SUBOS}; \
|
||||
${MAKE} ${@:realinstall=install} \
|
||||
DIRPRFX=${DIRPRFX}$$x.${SUBOS}/ || exit $$?; \
|
||||
cd ..; \
|
||||
fi; \
|
||||
done
|
||||
|
||||
all:
|
||||
|
@ -2,9 +2,11 @@
|
||||
# Copyright 2008 Roy Marples
|
||||
|
||||
AR?= ar
|
||||
CP?= cp
|
||||
ECHO?= echo
|
||||
INSTALL?= install
|
||||
RANLIB?= ranlib
|
||||
SED?= sed
|
||||
SH= /bin/sh
|
||||
|
||||
PREFIX?=
|
||||
|
@ -3,4 +3,4 @@ INC+= iwconfig.sh
|
||||
|
||||
.SUFFIXES: .sh.BSD.in
|
||||
.sh.BSD.in.sh:
|
||||
sed ${SED_REPLACE} ${SED_EXTRA} $< > $@
|
||||
${CP} $< $@
|
||||
|
@ -5,4 +5,4 @@ INC+= adsl.sh apipa.sh arping.sh bonding.sh br2684ctl.sh bridge.sh \
|
||||
|
||||
.SUFFIXES: .sh.Linux.in
|
||||
.sh.Linux.in.sh:
|
||||
sed ${SED_REPLACE} ${SED_EXTRA} $< > $@
|
||||
${CP} $< $@
|
||||
|
@ -1,3 +1,3 @@
|
||||
.SUFFIXES: .sh.BSD.in
|
||||
.sh.BSD.in.sh:
|
||||
sed ${SED_REPLACE} ${SED_EXTRA} $< > $@
|
||||
${CP} $< $@
|
||||
|
@ -4,5 +4,5 @@ NET_LO= net.lo0
|
||||
|
||||
.SUFFIXES: .sh.BSD.in
|
||||
.sh.BSD.in.sh:
|
||||
sed ${SED_REPLACE} ${SED_EXTRA} $< > $@
|
||||
${SED} ${SED_REPLACE} ${SED_EXTRA} $< > $@
|
||||
|
||||
|
@ -4,5 +4,5 @@ BIN+= init-early.sh
|
||||
|
||||
.SUFFIXES: .sh.Linux.in
|
||||
.sh.Linux.in.sh:
|
||||
sed ${SED_REPLACE} ${SED_EXTRA} $< > $@
|
||||
${SED} ${SED_REPLACE} ${SED_EXTRA} $< > $@
|
||||
|
||||
|
@ -6,4 +6,4 @@ BIN+= ifwatchd-carrier.sh ifwatchd-nocarrier.sh
|
||||
|
||||
.SUFFIXES: .sh.BSD.in
|
||||
.sh.BSD.in.sh:
|
||||
sed ${SED_REPLACE} ${SED_EXTRA} $< > $@
|
||||
${SED} ${SED_REPLACE} ${SED_EXTRA} $< > $@
|
||||
|
Loading…
Reference in New Issue
Block a user