[pkgsrc/trunk]: pkgsrc/mk GNU make installed from pkgsrc can always be found as

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a4897c43383b
branches:  trunk
changeset: 460313:a4897c43383b
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Aug 27 20:03:44 2003 +0000

description:
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).

diffstat:

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

diffs (18 lines):

diff -r 6461a854337a -r a4897c43383b mk/tools.mk
--- a/mk/tools.mk       Wed Aug 27 18:32:46 2003 +0000
+++ b/mk/tools.mk       Wed Aug 27 20:03:44 2003 +0000
@@ -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 @@
 .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)