From c4aece6e61258ed94916625a71fc7412b5be5637 Mon Sep 17 00:00:00 2001 From: apb Date: Sun, 14 Jan 2007 16:32:23 +0000 Subject: [PATCH] Pass TOOL_JOIN, TOOL_MKTEMP, NM, and TOOL_SED through to the tools version of lorder. Also remove the hack of treating Darwin differently, because the new TOOL_JOIN should solve that problem. --- tools/lorder/Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/lorder/Makefile b/tools/lorder/Makefile index d9612c1840b6..7a8e194b020b 100644 --- a/tools/lorder/Makefile +++ b/tools/lorder/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2007/01/11 15:10:08 ginsbach Exp $ +# $NetBSD: Makefile,v 1.9 2007/01/14 16:32:23 apb Exp $ .include @@ -21,11 +21,11 @@ ${TIMESTAMP}: lorder ${HOST_INSTALL_FILE} -m ${BINMODE} ${.ALLSRC} ${.TARGET} lorder: lorder.sh -.if ${BUILD_OSTYPE} == "Darwin" && ${BUILD_OSVERSION} < 8.0 - sed -e "s,/bin/sh,${HOST_BSHELL},g" \ - -e "/join/s/,/ /g" < ${.ALLSRC} > ${.TARGET} -.else - sed -e "s,/bin/sh,${HOST_BSHELL},g" < ${.ALLSRC} > ${.TARGET} -.endif + sed -e "s,/bin/sh,"${HOST_BSHELL:Q}",g" \ + -e "s,{JOIN:=.*},{JOIN:="${TOOL_JOIN:Q}"}," \ + -e "s,{MKTEMP:=.*},{MKTEMP:="${TOOL_MKTEMP:Q}"}," \ + -e "s,{NM:=.*},{NM:="${NM:Q}"}," \ + -e "s,{SED:=.*},{SED:="${TOOL_SED:Q}"}," \ + < ${.ALLSRC} > ${.TARGET} realall: lorder