diff options
| author | minskim <minskim> | 2004-12-29 23:19:42 +0000 |
|---|---|---|
| committer | minskim <minskim> | 2004-12-29 23:19:42 +0000 |
| commit | c6029db8317aa476a791126fc87d7fd71e80f909 (patch) | |
| tree | aade051396a5b633dd8a0404423fd5af133202a1 | |
| parent | 7b8f421d84677048704d04efdc6bdb2c6b5f1c1a (diff) | |
| download | pkgsrc-c6029db8317aa476a791126fc87d7fd71e80f909.tar.gz | |
Use GNU make on Linux when USE_IMAKE=yes, because Makefile generated
by imake on Linux requires GNU make.
| -rw-r--r-- | mk/bsd.pkg.mk | 5 | ||||
| -rw-r--r-- | mk/platform/Linux.mk | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index e6399cc2a95..a3bc8a15784 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -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 @@ _USE_GMAKE= yes .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 --git a/mk/platform/Linux.mk b/mk/platform/Linux.mk index 7287a15baad..383fe6bdc2c 100644 --- a/mk/platform/Linux.mk +++ b/mk/platform/Linux.mk @@ -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_MISCMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}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 |