summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2004-02-18 14:23:42 +0000
committerjlam <jlam@pkgsrc.org>2004-02-18 14:23:42 +0000
commit3bc670ced396e4413ea58d7dfdc9e78770dd4c48 (patch)
tree711ee14b493179a9425b15ee56fdc874a0ab0935 /mk
parentd2d5702ef7b0848a6a73bb10e4dd2c016cdd4b4b (diff)
downloadpkgsrc-3bc670ced396e4413ea58d7dfdc9e78770dd4c48.tar.gz
Remove some checks for PREPEND_PATH as we don't need them.
Diffstat (limited to 'mk')
-rw-r--r--mk/buildlink2/bsd.buildlink2.mk4
-rw-r--r--mk/buildlink3/bsd.buildlink3.mk4
-rw-r--r--mk/tools.mk5
3 files changed, 3 insertions, 10 deletions
diff --git a/mk/buildlink2/bsd.buildlink2.mk b/mk/buildlink2/bsd.buildlink2.mk
index c3ead5c4c14..7c844e148fa 100644
--- a/mk/buildlink2/bsd.buildlink2.mk
+++ b/mk/buildlink2/bsd.buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink2.mk,v 1.118 2004/02/18 13:32:38 jlam Exp $
+# $NetBSD: bsd.buildlink2.mk,v 1.119 2004/02/18 14:23:43 jlam Exp $
#
# An example package buildlink2.mk file:
#
@@ -125,9 +125,7 @@ LDFLAGS+= ${FLAG}
# Prepend ${BUILDLINK_DIR}/bin to the PATH so that the wrappers are found
# first when searching for executables.
#
-.if empty(PREPEND_PATH:M${BUILDLINK_DIR}/bin)
PREPEND_PATH+= ${BUILDLINK_DIR}/bin
-.endif
.for _pkg_ in ${BUILDLINK_PACKAGES}
#
diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk
index 7bf933008e6..a1fefd0b842 100644
--- a/mk/buildlink3/bsd.buildlink3.mk
+++ b/mk/buildlink3/bsd.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.92 2004/02/18 13:32:38 jlam Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.93 2004/02/18 14:23:43 jlam Exp $
#
# An example package buildlink3.mk file:
#
@@ -54,9 +54,7 @@ BUILDLINK_OPSYS?= ${OPSYS}
# Prepend ${BUILDLINK_DIR}/bin to the PATH so that the wrappers are found
# first when searching for executables.
#
-.if empty(PREPEND_PATH:M${BUILDLINK_DIR}/bin)
PREPEND_PATH+= ${BUILDLINK_DIR}/bin
-.endif
# BUILDLINK_DEPENDS contains the list of packages for which we add
# dependencies.
diff --git a/mk/tools.mk b/mk/tools.mk
index b6e45012a80..b1c40d7c9ee 100644
--- a/mk/tools.mk
+++ b/mk/tools.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.mk,v 1.28 2004/02/18 13:32:38 jlam Exp $
+# $NetBSD: tools.mk,v 1.29 2004/02/18 14:23:42 jlam Exp $
#
# This Makefile creates a ${TOOLS_DIR} directory and populates the bin
# subdir with tools that hide the ones outside of ${TOOLS_DIR}.
@@ -12,10 +12,7 @@ TOOLS_MK= # defined
# first when searching for executables.
#
TOOLS_DIR= ${WRKDIR}/.tools
-.if empty(PREPEND_PATH:M${TOOLS_DIR}/bin)
PREPEND_PATH+= ${TOOLS_DIR}/bin
-#PATH:= ${TOOLS_DIR}/bin:${PATH}
-.endif
TOOLS_SHELL?= ${SH}
_TOOLS_WRAP_LOG= ${WRKLOG}