[pkgsrc/trunk]: pkgsrc/mk Fixed joerg's failed try to support invoking make(1...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7780b1e3e253
branches:  trunk
changeset: 532170:7780b1e3e253
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Mon Aug 13 07:42:10 2007 +0000

description:
Fixed joerg's failed try to support invoking make(1) as ./make or similar.
It had failed in the devel/ directory, since devel/bmake exists there.

diffstat:

 mk/bsd.prefs.mk |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (29 lines):

diff -r d8c3465b97de -r 7780b1e3e253 mk/bsd.prefs.mk
--- a/mk/bsd.prefs.mk   Mon Aug 13 07:07:16 2007 +0000
+++ b/mk/bsd.prefs.mk   Mon Aug 13 07:42:10 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.261 2007/08/02 18:19:31 joerg Exp $
+# $NetBSD: bsd.prefs.mk,v 1.262 2007/08/13 07:42:10 rillig Exp $
 #
 # Make file, included to get the site preferences, if any.  Should
 # only be included by package Makefiles before any .if defined()
@@ -26,15 +26,16 @@
 # Expand MAKE to a full path.
 .if !defined(_MAKE)
 _MAKE:=        ${MAKE}
+# allow for MAKE=./make and similar.
+.  if empty(_MAKE:M/*) && !empty(_MAKE:M*/*) && defined(PWD) && exists(${PWD}/${MAKE})
+_MAKE:=        ${PWD}/${MAKE}
+.  endif
 .  for _dir_ in ${PATH:C/\:/ /g}
 .    if empty(_MAKE:M/*)
 .      if exists(${_dir_}/${MAKE})
 _MAKE:=        ${_dir_}/${MAKE}
 .      endif
 .    endif
-.  if empty(_MAKE:M/*) && defined(PWD) && exists(${PWD}/${MAKE})
-_MAKE:=        ${_PWD_}/${MAKE}
-.  endif
 .  endfor
 .  if !empty(_MAKE:M/*)
 MAKEFLAGS+=    _MAKE=${_MAKE:Q}