From 30dae4758566d35c549db7312e633a3e2a0e27c1 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Wed, 27 Aug 2003 20:03:44 +0000
Subject: GNU make installed from pkgsrc can always be found as
 ${LOCALBASE}/bin/gmake.  ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}/make
 technically works, too, but this covers the (unsupported!!) case where the
 user has GNU_PROGRAM_PREFIX="" and has moved the "make" binary directly over
 the "gmake" symlink created by pkgsrc (Jeremy Reed reported this problem on
 tech-pkg@ because he uses this a a debugging technique to find out whether
 GNU make is actually needed by a package or not).

---
 mk/tools.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mk/tools.mk b/mk/tools.mk
index 1c9fcbaefeb..2d506bc34da 100644
--- a/mk/tools.mk
+++ b/mk/tools.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.mk,v 1.11 2003/08/27 01:58:25 jlam Exp $
+# $NetBSD: tools.mk,v 1.12 2003/08/27 20:03:44 jlam Exp $
 #
 # This Makefile creates a ${TOOLS_DIR} directory and populates the bin
 # subdir with tools that hide the ones outside of ${TOOLS_DIR}.
@@ -224,7 +224,7 @@ _TOOLS_PROGNAME.make=	${GMAKE}
 .if (${_TOOLS_NEED_GNU.make} == "YES") && empty(PKGPATH:Mdevel/gmake)
 BUILD_DEPENDS+=		gmake>=3.78:../../devel/gmake
 _TOOLS_OVERRIDE.make=	YES
-_TOOLS_PROGNAME.make=	${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}make
+_TOOLS_PROGNAME.make=	${LOCALBASE}/bin/gmake	# "gmake" always exists
 GMAKE:=			${_TOOLS_PROGNAME.make}
 .endif
 .if !empty(PKGPATH:Mdevel/gmake)
-- 
cgit v1.2.3