diff options
| -rw-r--r-- | doc/Makefile.FreeBSD | 2 | ||||
| -rw-r--r-- | doc/Makefile.Linux | 2 | ||||
| -rw-r--r-- | doc/Makefile.NetBSD | 2 | ||||
| -rw-r--r-- | mk/scripts.mk | 4 | ||||
| -rw-r--r-- | mk/subdir.mk | 14 | ||||
| -rw-r--r-- | mk/sys.mk | 2 | ||||
| -rw-r--r-- | net/Makefile.FreeBSD | 2 | ||||
| -rw-r--r-- | net/Makefile.Linux | 2 | ||||
| -rw-r--r-- | net/Makefile.NetBSD | 2 | ||||
| -rw-r--r-- | sh/Makefile.FreeBSD | 2 | ||||
| -rw-r--r-- | sh/Makefile.Linux | 2 | ||||
| -rw-r--r-- | sh/Makefile.NetBSD | 2 |
12 files changed, 13 insertions, 25 deletions
diff --git a/doc/Makefile.FreeBSD b/doc/Makefile.FreeBSD index d40d9427..a21536b1 100644 --- a/doc/Makefile.FreeBSD +++ b/doc/Makefile.FreeBSD @@ -2,4 +2,4 @@ SRCS+= net.example.in .SUFFIXES: .BSD.in .BSD.in: - sed ${SED_REPLACE} ${SED_EXTRA} $< > $@ + ${CP} $< $@ diff --git a/doc/Makefile.Linux b/doc/Makefile.Linux index 5981ec1d..405f7ea9 100644 --- a/doc/Makefile.Linux +++ b/doc/Makefile.Linux @@ -2,4 +2,4 @@ SRCS+= net.example.in .SUFFIXES: .Linux.in .Linux.in: - sed ${SED_REPLACE} ${SED_EXTRA} $< > $@ + ${CP} $< $@ diff --git a/doc/Makefile.NetBSD b/doc/Makefile.NetBSD index d40d9427..a21536b1 100644 --- a/doc/Makefile.NetBSD +++ b/doc/Makefile.NetBSD @@ -2,4 +2,4 @@ SRCS+= net.example.in .SUFFIXES: .BSD.in .BSD.in: - sed ${SED_REPLACE} ${SED_EXTRA} $< > $@ + ${CP} $< $@ diff --git a/mk/scripts.mk b/mk/scripts.mk index e6889fc4..e1616cc9 100644 --- a/mk/scripts.mk +++ b/mk/scripts.mk @@ -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} diff --git a/mk/subdir.mk b/mk/subdir.mk index fcb5cf22..fbac0bab 100644 --- a/mk/subdir.mk +++ b/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?= diff --git a/net/Makefile.FreeBSD b/net/Makefile.FreeBSD index cd1a6712..1a661db2 100644 --- a/net/Makefile.FreeBSD +++ b/net/Makefile.FreeBSD @@ -3,4 +3,4 @@ INC+= iwconfig.sh .SUFFIXES: .sh.BSD.in .sh.BSD.in.sh: - sed ${SED_REPLACE} ${SED_EXTRA} $< > $@ + ${CP} $< $@ diff --git a/net/Makefile.Linux b/net/Makefile.Linux index 1a496c73..5cd456ea 100644 --- a/net/Makefile.Linux +++ b/net/Makefile.Linux @@ -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} $< $@ diff --git a/net/Makefile.NetBSD b/net/Makefile.NetBSD index 2ff47505..9ae55981 100644 --- a/net/Makefile.NetBSD +++ b/net/Makefile.NetBSD @@ -1,3 +1,3 @@ .SUFFIXES: .sh.BSD.in .sh.BSD.in.sh: - sed ${SED_REPLACE} ${SED_EXTRA} $< > $@ + ${CP} $< $@ diff --git a/sh/Makefile.FreeBSD b/sh/Makefile.FreeBSD index 48e6ba5a..93a00a01 100644 --- a/sh/Makefile.FreeBSD +++ b/sh/Makefile.FreeBSD @@ -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} $< > $@ diff --git a/sh/Makefile.Linux b/sh/Makefile.Linux index fed0e7aa..b73b4665 100644 --- a/sh/Makefile.Linux +++ b/sh/Makefile.Linux @@ -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} $< > $@ diff --git a/sh/Makefile.NetBSD b/sh/Makefile.NetBSD index f3480198..0e4200aa 100644 --- a/sh/Makefile.NetBSD +++ b/sh/Makefile.NetBSD @@ -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} $< > $@ |