summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorcjep <cjep>2003-04-20 12:06:01 +0000
committercjep <cjep>2003-04-20 12:06:01 +0000
commitb9985fdc507bb879197679fb262202e1cb701564 (patch)
treee503f0423907f9ffc54215908a3fd7ab85e8269e /mk
parent57eb6aa8f278ddec33d093428cf416ca7a8d97d8 (diff)
downloadpkgsrc-b9985fdc507bb879197679fb262202e1cb701564.tar.gz
touch(1), cut(1) and nice(1) are not necessarily required in /bin on Linux
systems according to FHS. Make provision for distributions that don't put them there. From Jeremy Reed in PR#21235.
Diffstat (limited to 'mk')
-rw-r--r--mk/defs.Linux.mk14
1 files changed, 13 insertions, 1 deletions
diff --git a/mk/defs.Linux.mk b/mk/defs.Linux.mk
index d5e223a5055..060513697cc 100644
--- a/mk/defs.Linux.mk
+++ b/mk/defs.Linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.Linux.mk,v 1.50 2003/04/15 05:29:47 grant Exp $
+# $NetBSD: defs.Linux.mk,v 1.51 2003/04/20 12:06:01 cjep Exp $
#
# Variable definitions for the Linux operating system.
@@ -14,7 +14,11 @@ CHOWN?= /bin/chown
CHGRP?= /bin/chgrp
CMP?= cmp
CP?= /bin/cp
+.if exists(/bin/cut)
CUT?= /bin/cut
+.else
+CUT?= /usr/bin/cut
+.endif
DATE?= /bin/date
DC?= /usr/bin/dc
DIRNAME?= /usr/bin/dirname
@@ -54,7 +58,11 @@ M4?= /usr/bin/m4
MKDIR?= /bin/mkdir -p
MTREE?= ${ZOULARISBASE}/sbin/mtree
MV?= /bin/mv
+.if exists(/bin/nice)
NICE?= /bin/nice
+.else
+NICE?= /usr/bin/nice
+.endif
PATCH?= /usr/bin/patch
PAX?= ${ZOULARISBASE}/bin/pax
PERL5?= ${LOCALBASE}/bin/perl
@@ -80,7 +88,11 @@ SU?= /bin/su
TAIL?= /usr/bin/tail
TEE?= /usr/bin/tee
TEST?= /usr/bin/test
+.if exists(/bin/touch)
TOUCH?= /bin/touch
+.else
+TOUCH?= /usr/bin/touch
+.endif
TR?= /usr/bin/tr
TRUE?= /bin/true
TSORT?= /usr/bin/tsort