[pkgsrc/trunk]: pkgsrc/mk Use GNU make on Linux when USE_IMAKE=yes, because M...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/032963b05397
branches:  trunk
changeset: 486576:032963b05397
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Wed Dec 29 23:19:42 2004 +0000

description:
Use GNU make on Linux when USE_IMAKE=yes, because Makefile generated
by imake on Linux requires GNU make.

diffstat:

 mk/bsd.pkg.mk        |  5 ++++-
 mk/platform/Linux.mk |  4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diffs (37 lines):

diff -r 06a53d1ce6e3 -r 032963b05397 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Wed Dec 29 23:19:34 2004 +0000
+++ b/mk/bsd.pkg.mk     Wed Dec 29 23:19:42 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1550 2004/12/27 06:41:50 jlam Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1551 2004/12/29 23:19:42 minskim Exp $
 #
 # This file is in the public domain.
 #
@@ -255,6 +255,9 @@
 .if defined(_USE_GMAKE)
 MAKE_PROGRAM=          ${GMAKE}
 .elif defined(USE_IMAKE)
+.  if ${_IMAKE_MAKE} == ${GMAKE}
+USE_GNU_TOOLS+=                make
+.  endif
 MAKE_PROGRAM=          ${_IMAKE_MAKE}
 .else
 MAKE_PROGRAM=          ${MAKE}
diff -r 06a53d1ce6e3 -r 032963b05397 mk/platform/Linux.mk
--- a/mk/platform/Linux.mk      Wed Dec 29 23:19:34 2004 +0000
+++ b/mk/platform/Linux.mk      Wed Dec 29 23:19:42 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Linux.mk,v 1.5 2004/11/16 18:04:00 tv Exp $
+# $NetBSD: Linux.mk,v 1.6 2004/12/29 23:19:43 minskim Exp $
 #
 # Variable definitions for the Linux operating system.
 
@@ -162,7 +162,7 @@
 IMAKE_MANNEWSUFFIX=    ${IMAKE_MAN_SUFFIX}
 
 _DO_SHLIB_CHECKS=      no      # on installation, fixup PLIST for shared libs
-_IMAKE_MAKE=           ${MAKE} # program which gets invoked by imake
+_IMAKE_MAKE=           ${GMAKE}        # program which gets invoked by imake
 .if exists(/usr/include/netinet6) || exists(/usr/include/linux/in6.h)
 _OPSYS_HAS_INET6=      yes     # IPv6 is standard
 .else