Sat Jan 12 22:44:11 2008 UTC ()
Only force gmake for imake on Linux, if using native implementation.


(joerg)
diff -r1.31 -r1.32 pkgsrc/mk/platform/Linux.mk

cvs diff -r1.31 -r1.32 pkgsrc/mk/platform/Linux.mk (expand / switch to unified diff)

--- pkgsrc/mk/platform/Linux.mk 2007/10/19 13:41:35 1.31
+++ pkgsrc/mk/platform/Linux.mk 2008/01/12 22:44:10 1.32
@@ -1,19 +1,21 @@ @@ -1,19 +1,21 @@
1# $NetBSD: Linux.mk,v 1.31 2007/10/19 13:41:35 rillig Exp $ 1# $NetBSD: Linux.mk,v 1.32 2008/01/12 22:44:10 joerg Exp $
2# 2#
3# Variable definitions for the Linux operating system. 3# Variable definitions for the Linux operating system.
4 4
5ECHO_N?= ${ECHO} -n 5ECHO_N?= ${ECHO} -n
 6.if !defined(X11_TYPE) || ${X11_TYPE} == "native"
6IMAKE_MAKE?= ${GMAKE} # program which gets invoked by imake 7IMAKE_MAKE?= ${GMAKE} # program which gets invoked by imake
 8.endif
7IMAKEOPTS+= -DBuildHtmlManPages=NO 9IMAKEOPTS+= -DBuildHtmlManPages=NO
8PKGLOCALEDIR?= share 10PKGLOCALEDIR?= share
9PS?= /bin/ps 11PS?= /bin/ps
10# XXX: default from defaults/mk.conf. Verify/correct for this platform 12# XXX: default from defaults/mk.conf. Verify/correct for this platform
11# and remove this comment. 13# and remove this comment.
12SU?= /bin/su 14SU?= /bin/su
13TYPE?= type # Shell builtin 15TYPE?= type # Shell builtin
14 16
15CPP_PRECOMP_FLAGS?= # unset 17CPP_PRECOMP_FLAGS?= # unset
16DEF_UMASK?= 022 18DEF_UMASK?= 022
17DEFAULT_SERIAL_DEVICE?= /dev/null 19DEFAULT_SERIAL_DEVICE?= /dev/null
18EXPORT_SYMBOLS_LDFLAGS?= # Don't add symbols to the dynamic symbol table 20EXPORT_SYMBOLS_LDFLAGS?= # Don't add symbols to the dynamic symbol table
19GROUPADD?= /usr/sbin/groupadd 21GROUPADD?= /usr/sbin/groupadd