From c3cfa6c470bc762dd400c22dbabb2a08edd07abc Mon Sep 17 00:00:00 2001
From: rillig <rillig@pkgsrc.org>
Date: Mon, 13 Aug 2007 07:42:10 +0000
Subject: 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.

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

(limited to 'mk/bsd.prefs.mk')

diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk
index 5bf5c2ca15c..35e0243fd8c 100644
--- a/mk/bsd.prefs.mk
+++ b/mk/bsd.prefs.mk
@@ -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 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 # 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}
-- 
cgit v1.2.3