From f77c305a1532b10f147cf56037c3c38604b50c14 Mon Sep 17 00:00:00 2001
From: obache <obache>
Date: Sat, 16 Jan 2010 02:16:35 +0000
Subject: Add support of SSD/Linux.  * ROOT_GROUP=wheel, fixes PR#42073.  *
 LOWER_VENDOR=ssd  * adjust paths for some tools

---
 mk/tools/tools.Linux.mk | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'mk/tools')

diff --git a/mk/tools/tools.Linux.mk b/mk/tools/tools.Linux.mk
index d108f9ea01a..d5b732b7b13 100644
--- a/mk/tools/tools.Linux.mk
+++ b/mk/tools/tools.Linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Linux.mk,v 1.45 2009/10/11 07:36:11 tnn Exp $
+# $NetBSD: tools.Linux.mk,v 1.46 2010/01/16 02:16:35 obache Exp $
 #
 # System-supplied tools for the Linux operating system.
 
@@ -63,7 +63,11 @@ TOOLS_PLATFORM.egrep?=		/bin/egrep
 TOOLS_PLATFORM.egrep?=		/usr/bin/egrep
 .endif
 TOOLS_PLATFORM.env?=		/usr/bin/env
+.if exists(/usr/bin/expr)
 TOOLS_PLATFORM.expr?=		/usr/bin/expr
+.elif exists(/bin/expr)
+TOOLS_PLATFORM.expr?=		/bin/expr
+.endif
 TOOLS_PLATFORM.false?=		false			# shell builtin
 .if exists(/bin/fgrep)
 TOOLS_PLATFORM.fgrep?=		/bin/fgrep
@@ -99,7 +103,11 @@ TOOLS_PLATFORM.gsed?=		/usr/bin/sed
 .if exists(/usr/bin/soelim)
 TOOLS_PLATFORM.gsoelim?=	/usr/bin/soelim
 .endif
+.if exists(/bin/tar)
 TOOLS_PLATFORM.gtar?=		/bin/tar
+.elif exists(/usr/bin/tar)
+TOOLS_PLATFORM.gtar?=		/usr/bin/tar
+.endif
 .if exists(/bin/gunzip)
 TOOLS_PLATFORM.gunzip?=		/bin/gunzip -f
 .elif exists(/usr/bin/gunzip)
@@ -107,6 +115,8 @@ TOOLS_PLATFORM.gunzip?=		/usr/bin/gunzip -f
 .endif
 .if exists(/bin/zcat)
 TOOLS_PLATFORM.gzcat?=		/bin/zcat
+.elif exists(/usr/bin/zcat)
+TOOLS_PLATFORM.gzcat?=		/usr/bin/zcat
 .endif
 .if exists(/bin/gzip)
 TOOLS_PLATFORM.gzip?=		/bin/gzip -nf ${GZIP}
@@ -222,3 +232,6 @@ TOOLS_PLATFORM.xargs?=		/usr/bin/xargs -r
 .if exists(/usr/bin/xgettext)
 TOOLS_PLATFORM.xgettext?=	/usr/bin/xgettext
 .endif
+.if exists(/usr/bin/yacc)
+TOOLS_PLATFORM.yacc?=		/usr/bin/yacc
+.endif
-- 
cgit v1.2.3