summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortv <tv@pkgsrc.org>2001-11-28 19:58:13 +0000
committertv <tv@pkgsrc.org>2001-11-28 19:58:13 +0000
commit92d724ccfecc3a8141849af05487d01b411bb02e (patch)
treefdf87ee805c645d527db22985f7a54d3ff9ef983
parent208d40b3a266991e8aba62c378769bfd1af43627 (diff)
downloadpkgsrc-92d724ccfecc3a8141849af05487d01b411bb02e.tar.gz
In the odd possible case of someone using "pkgsrc" underneath "src"
(even though that's still a bad idea), set USETOOLS=no explicitly before including <bsd.own.mk>, and add this also to MAKE_ENV to make BSD-Makefile based packages build properly.
-rw-r--r--mk/bsd.prefs.mk7
1 files changed, 6 insertions, 1 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk
index a5c5719ded3..8860d304592 100644
--- a/mk/bsd.prefs.mk
+++ b/mk/bsd.prefs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.64 2001/11/21 14:10:06 agc Exp $
+# $NetBSD: bsd.prefs.mk,v 1.65 2001/11/28 19:58:13 tv Exp $
#
# Make file, included to get the site preferences, if any. Should
# only be included by package Makefiles before any .if defined()
@@ -104,6 +104,11 @@ MACHINE_GNU_PLATFORM?= ${LOWER_ARCH}-${LOWER_VENDOR}-${LOWER_OPSYS}
# from being created in bsd.own.mk.
NEED_OWN_INSTALL_TARGET=no
+# This prevents default use of the cross-tool harness in the "src" tree,
+# in the odd possible case of someone extracting "pkgsrc" underneath "src".
+USETOOLS= no
+MAKE_ENV+= USETOOLS=no
+
.include <bsd.own.mk>
# include the defaults file