From 833903fc78743ded22abcc49fba285ff9ddb8e8a Mon Sep 17 00:00:00 2001
From: Roy Marples <roy@marples.name>
Date: Wed, 26 Mar 2008 14:27:46 +0000
Subject: use $CP and $SED instead of cp and sed

---
 mk/scripts.mk |  4 ++--
 mk/subdir.mk  | 14 --------------
 mk/sys.mk     |  2 ++
 3 files changed, 4 insertions(+), 16 deletions(-)

(limited to 'mk')

diff --git a/mk/scripts.mk b/mk/scripts.mk
index e6889fc..e1616cc 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 fcb5cf2..fbac0ba 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:
diff --git a/mk/sys.mk b/mk/sys.mk
index bcf87d7..47e4adc 100644
--- a/mk/sys.mk
+++ b/mk/sys.mk
@@ -2,9 +2,11 @@
 # Copyright 2008 Roy Marples
 
 AR?=			ar
+CP?=			cp
 ECHO?=			echo
 INSTALL?=		install
 RANLIB?=		ranlib
+SED?=			sed
 SH=			/bin/sh
 
 PREFIX?=	
-- 
cgit v1.2.3