[pkgsrc/trunk]: pkgsrc/mk If we use the new tools framework, the _USE_GMAKE i...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/afcdc1223399
branches:  trunk
changeset: 493765:afcdc1223399
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sat May 14 07:15:29 2005 +0000

description:
If we use the new tools framework, the _USE_GMAKE is unnecessary as we
simply check for whether "gmake" is in USE_TOOLS.

diffstat:

 mk/bsd.pkg.mk |  7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diffs (31 lines):

diff -r 7c1013be5d75 -r afcdc1223399 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Sat May 14 06:07:33 2005 +0000
+++ b/mk/bsd.pkg.mk     Sat May 14 07:15:29 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1649 2005/05/14 06:04:44 jlam Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1650 2005/05/14 07:15:29 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -381,11 +381,10 @@
 .endif
 BUILD_DEFS+=           _PLIST_IGNORE_FILES
 
+.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
 .if !empty(USE_GNU_TOOLS:Mmake)
 _USE_GMAKE=            yes
 .endif
-
-.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
 .if defined(_USE_GMAKE)
 MAKE_PROGRAM=          ${GMAKE}
 .elif defined(USE_IMAKE)
@@ -4530,7 +4529,7 @@
 .  if defined(USE_PERL5) && (${USE_PERL5} == "run")
        @${ECHO} "PERL=`${PERL5} --version 2>/dev/null | ${GREP} 'This is perl'`" >> ${BUILD_INFO_FILE}
 .  endif
-.  if defined(_USE_GMAKE)
+.  if defined(_USE_GMAKE) || !empty(USE_TOOLS:Mgmake)
        @${ECHO} "GMAKE=`${GMAKE} --version | ${GREP} Make`" >> ${BUILD_INFO_FILE}
 .  endif
        ${_PKG_SILENT}${_PKG_DEBUG}                                     \