From ddd4c9aaf35266a6887d430615e76cfa963676be Mon Sep 17 00:00:00 2001 From: dbj Date: Sun, 20 Jul 2008 23:54:48 +0000 Subject: support NBPAX_PROGRAM_PREFIX variable in TOOLS_PLATFORM.{pax,tar} leave default value unset to preserve existing behavior. you can now set NBPAX_PROGRAM_PREFIX=nb (for example) in your mk.conf to have the bootstrap install and use nbpax/nbtar/nbcpio which don't conflict with system provided tools. --- bootstrap/bootstrap | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'bootstrap') diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap index 5a719fad006..ce27707bcfe 100755 --- a/bootstrap/bootstrap +++ b/bootstrap/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh -# $NetBSD: bootstrap,v 1.132 2008/06/19 18:36:51 joerg Exp $ +# $NetBSD: bootstrap,v 1.133 2008/07/20 23:54:48 dbj Exp $ # # # Copyright (c) 2001-2002 Alistair G. Crooks. All rights reserved. @@ -451,6 +451,7 @@ Darwin) need_awk=no need_sed=no set_opsys=no + [ -z "$fetch_cmd" ] && fetch_cmd="/usr/bin/ftp" machine_arch=`uname -p` CC="gcc -isystem /usr/include"; export CC osrev=`uname -r` @@ -953,10 +954,10 @@ esac case "$need_pax" in yes) - echo "TOOLS_PLATFORM.pax?= $prefix/bin/pax" >> ${TARGET_MKCONF} - echo "TOOLS_PLATFORM.pax?= $prefix/bin/pax" >> ${BOOTSTRAP_MKCONF} - echo "TOOLS_PLATFORM.tar?= $prefix/bin/tar" >> ${TARGET_MKCONF} - echo "TOOLS_PLATFORM.tar?= $prefix/bin/tar" >> ${BOOTSTRAP_MKCONF} + echo "TOOLS_PLATFORM.pax?= $prefix/bin/\${NBPAX_PROGRAM_PREFIX}pax" >> ${TARGET_MKCONF} + echo "TOOLS_PLATFORM.pax?= $prefix/bin/\${NBPAX_PROGRAM_PREFIX}pax" >> ${BOOTSTRAP_MKCONF} + echo "TOOLS_PLATFORM.tar?= $prefix/bin/\${NBPAX_PROGRAM_PREFIX}tar" >> ${TARGET_MKCONF} + echo "TOOLS_PLATFORM.tar?= $prefix/bin/\${NBPAX_PROGRAM_PREFIX}tar" >> ${BOOTSTRAP_MKCONF} ;; *) echo "TOOLS_PLATFORM.pax?= $paxprog" >> ${TARGET_MKCONF} -- cgit v1.2.3