diff options
| author | jlam <jlam> | 2003-08-27 20:03:44 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2003-08-27 20:03:44 +0000 |
| commit | 4c3b69ec3dbeea67fd8352b8edea2b6e3b15f672 (patch) | |
| tree | 736b2d2c697b0217bc161e7b21f9042b60c53d75 | |
| parent | 746569ebdf8f488dda3462e4bf885d629bbdf17c (diff) | |
| download | pkgsrc-4c3b69ec3dbeea67fd8352b8edea2b6e3b15f672.tar.gz | |
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).
| -rw-r--r-- | mk/tools.mk | 4 |
1 files 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) |