summaryrefslogtreecommitdiff
path: root/devel/bmake/files/boot-strap
diff options
context:
space:
mode:
Diffstat (limited to 'devel/bmake/files/boot-strap')
-rwxr-xr-xdevel/bmake/files/boot-strap19
1 files changed, 16 insertions, 3 deletions
diff --git a/devel/bmake/files/boot-strap b/devel/bmake/files/boot-strap
index 8bfce51e746..2aa8f7f339e 100755
--- a/devel/bmake/files/boot-strap
+++ b/devel/bmake/files/boot-strap
@@ -89,6 +89,10 @@
# disable use of filemon(9) which is currently only
# available for NetBSD and FreeBSD.
#
+# --with-filemon=ktrace
+# on NetBSD or others with fktrace(2), use ktrace
+# version of filemon.
+#
# --with-filemon="path/to/filemon.h"
# enables use of filemon(9) by meta mode.
#
@@ -111,7 +115,7 @@
# Simon J. Gerraty <sjg@crufty.net>
# RCSid:
-# $Id: boot-strap,v 1.1.1.11 2015/05/19 21:36:43 joerg Exp $
+# $Id: boot-strap,v 1.1.1.12 2020/05/24 05:35:51 nia Exp $
#
# @(#) Copyright (c) 2001 Simon J. Gerraty
#
@@ -161,6 +165,8 @@ cmd_args="$@"
# clear some things from the environment that we care about
unset MAKEOBJDIR MAKEOBJDIRPREFIX
+# or that might be incompatible
+unset MAKE MAKEFLAGS
# --install[-host-target] will set this
INSTALL_PREFIX=
@@ -395,8 +401,15 @@ Bmake() {
)
}
+# there is actually a shell where type is not a builtin
+# if type is missing, which(1) had better exists!
+if (type cat) > /dev/null 2>&1; then
+which() {
+ type "$@" | sed 's,[()],,g;s,^[^/][^/]*,,;q'
+}
+fi
# make sure test below uses the same diff that configure did
-TOOL_DIFF=`type diff | sed 's,[()],,g;s,^[^/][^/]*,,;q'`
+TOOL_DIFF=`which diff`
export TOOL_DIFF
op_configure() {
@@ -444,7 +457,7 @@ op_all() {
op_install
else
op_test
- MAKE_VERSION=`sed -n '/^MAKE_VERSION/ { s,.*= *,,;p; }' $srcdir/Makefile`
+ MAKE_VERSION=`sed -n '/^_MAKE_VERSION/ { s,.*= *,,;p; }' $srcdir/Makefile`
echo You can install by running:
echo
echo $0 $cmd_args op=install