diff options
-rw-r--r-- | mk/platform/AIX.mk | 4 | ||||
-rw-r--r-- | mk/platform/BSDOS.mk | 4 | ||||
-rw-r--r-- | mk/platform/Darwin.mk | 4 | ||||
-rw-r--r-- | mk/platform/DragonFly.mk | 4 | ||||
-rw-r--r-- | mk/platform/FreeBSD.mk | 4 | ||||
-rw-r--r-- | mk/platform/IRIX.mk | 4 | ||||
-rw-r--r-- | mk/platform/Interix.mk | 4 | ||||
-rw-r--r-- | mk/platform/Linux.mk | 6 | ||||
-rw-r--r-- | mk/platform/NetBSD.mk | 4 | ||||
-rw-r--r-- | mk/platform/OSF1.mk | 6 | ||||
-rw-r--r-- | mk/platform/OpenBSD.mk | 4 | ||||
-rw-r--r-- | mk/platform/SunOS.mk | 4 | ||||
-rw-r--r-- | mk/platform/UnixWare.mk | 4 | ||||
-rw-r--r-- | mk/tools/make.mk | 6 |
14 files changed, 31 insertions, 31 deletions
diff --git a/mk/platform/AIX.mk b/mk/platform/AIX.mk index 620523ee341..cbd9fe47566 100644 --- a/mk/platform/AIX.mk +++ b/mk/platform/AIX.mk @@ -1,9 +1,10 @@ -# $NetBSD: AIX.mk,v 1.17 2005/05/22 19:11:15 jlam Exp $ +# $NetBSD: AIX.mk,v 1.18 2005/06/01 18:14:23 jlam Exp $ # # Variable definitions for the AIX operating system. CPP?= ${LOCALBASE}/bin/cpp ECHO_N?= ${ECHO} -n +IMAKE_MAKE?= ${MAKE} # program which gets invoked by imake PKGLOCALEDIR?= share PS?= /bin/ps # XXX: default from bsd.pkg.defaults.mk. Verify/corerct for this platform @@ -41,7 +42,6 @@ IMAKE_FILEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}5 IMAKE_MANNEWSUFFIX= 0 _DO_SHLIB_CHECKS= yes -_IMAKE_MAKE= ${MAKE} # program which gets invoked by imake .if exists(/usr/include/netinet6) _OPSYS_HAS_INET6= yes # IPv6 is standard .else diff --git a/mk/platform/BSDOS.mk b/mk/platform/BSDOS.mk index a92da1b4698..4bd6fd52518 100644 --- a/mk/platform/BSDOS.mk +++ b/mk/platform/BSDOS.mk @@ -1,4 +1,4 @@ -# $NetBSD: BSDOS.mk,v 1.12 2005/06/01 14:23:07 markd Exp $ +# $NetBSD: BSDOS.mk,v 1.13 2005/06/01 18:14:23 jlam Exp $ # # Variable definitions for the BSD/OS operating system. @@ -8,6 +8,7 @@ CXX= /usr/bin/g++ .endif ECHO_N?= ${ECHO} -n +IMAKE_MAKE?= ${MAKE} # program which gets invoked by imake PKGLOCALEDIR?= share PS?= /bin/ps # XXX: default from bsd.pkg.defaults.mk. Verify/corerct for this platform @@ -46,7 +47,6 @@ IMAKE_LIBMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}3 IMAKE_FILEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}5 _DO_SHLIB_CHECKS= yes # fixup PLIST for shared libs/run ldconfig -_IMAKE_MAKE= ${MAKE} # program which gets invoked by imake .if exists(/usr/include/netinet6) _OPSYS_HAS_INET6= yes # IPv6 is standard .else diff --git a/mk/platform/Darwin.mk b/mk/platform/Darwin.mk index 50e0349535f..26e2a8df411 100644 --- a/mk/platform/Darwin.mk +++ b/mk/platform/Darwin.mk @@ -1,4 +1,4 @@ -# $NetBSD: Darwin.mk,v 1.11 2005/05/22 19:11:15 jlam Exp $ +# $NetBSD: Darwin.mk,v 1.12 2005/06/01 18:14:23 jlam Exp $ # # Variable definitions for the Darwin operating system. @@ -7,6 +7,7 @@ CPP= ${CC} -E ${CPP_PRECOMP_FLAGS} .endif ECHO_N?= ${ECHO} -n LDD?= /usr/bin/otool -L +IMAKE_MAKE?= ${MAKE} # program which gets invoked by imake PKGLOCALEDIR?= share PS?= /bin/ps # XXX: default from bsd.pkg.defaults.mk. Verify/corerct for this platform @@ -51,7 +52,6 @@ IMAKE_FILEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}5 IMAKE_MANNEWSUFFIX= ${IMAKE_MAN_SUFFIX} _DO_SHLIB_CHECKS= yes # on installation, fixup PLIST for shared libs -_IMAKE_MAKE= ${MAKE} # program which gets invoked by imake .if ${OS_VERSION:R} >= 6 _OPSYS_HAS_INET6= yes # IPv6 is standard .else diff --git a/mk/platform/DragonFly.mk b/mk/platform/DragonFly.mk index 1b0b16c29e3..a2ecac16c71 100644 --- a/mk/platform/DragonFly.mk +++ b/mk/platform/DragonFly.mk @@ -1,9 +1,10 @@ -# $NetBSD: DragonFly.mk,v 1.15 2005/05/31 12:31:21 salo Exp $ +# $NetBSD: DragonFly.mk,v 1.16 2005/06/01 18:14:23 jlam Exp $ # # Variable definitions for the DragonFly operating system. BRANDELF?= /usr/bin/brandelf # used by linux compat layer ECHO_N?= ${ECHO} -n +IMAKE_MAKE?= ${MAKE} # program which gets invoked by imake IMAKEOPTS+= -DBuildHtmlManPages=NO PKGLOCALEDIR?= share PS?= /bin/ps @@ -43,7 +44,6 @@ IMAKE_MISCMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}7 IMAKE_MANNEWSUFFIX= ${IMAKE_MAN_SUFFIX} _DO_SHLIB_CHECKS= yes # fixup PLIST for shared libs/run ldconfig -_IMAKE_MAKE= ${MAKE} # program which gets invoked by imake .if exists(/usr/include/netinet6) _OPSYS_HAS_INET6= yes # IPv6 is standard .else diff --git a/mk/platform/FreeBSD.mk b/mk/platform/FreeBSD.mk index ac8d0aca071..f70627270ac 100644 --- a/mk/platform/FreeBSD.mk +++ b/mk/platform/FreeBSD.mk @@ -1,8 +1,9 @@ -# $NetBSD: FreeBSD.mk,v 1.11 2005/05/22 19:11:15 jlam Exp $ +# $NetBSD: FreeBSD.mk,v 1.12 2005/06/01 18:14:23 jlam Exp $ # # Variable definitions for the FreeBSD operating system. ECHO_N?= ${ECHO} -n +IMAKE_MAKE?= ${MAKE} # program which gets invoked by imake IMAKEOPTS+= -DBuildHtmlManPages=NO PKGLOCALEDIR?= share PS?= /bin/ps @@ -42,7 +43,6 @@ IMAKE_MISCMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}7 IMAKE_MANNEWSUFFIX= ${IMAKE_MAN_SUFFIX} _DO_SHLIB_CHECKS= yes # fixup PLIST for shared libs/run ldconfig -_IMAKE_MAKE= ${MAKE} # program which gets invoked by imake .if exists(/usr/include/netinet6) _OPSYS_HAS_INET6= yes # IPv6 is standard .else diff --git a/mk/platform/IRIX.mk b/mk/platform/IRIX.mk index 2a0253698ec..4c9b78db176 100644 --- a/mk/platform/IRIX.mk +++ b/mk/platform/IRIX.mk @@ -1,8 +1,9 @@ -# $NetBSD: IRIX.mk,v 1.14 2005/05/22 19:11:15 jlam Exp $ +# $NetBSD: IRIX.mk,v 1.15 2005/06/01 18:14:23 jlam Exp $ # # Variable definitions for the IRIX operating system. ECHO_N?= ${ECHO} -n +IMAKE_MAKE?= ${MAKE} # program which gets invoked by imake IMAKEOPTS+= -DMakeCmd=${PREFIX}/bin/bmake -DProjectRoot=${X11BASE} IMAKEOPTS+= -DManUsr=${PREFIX} PKGLOCALEDIR?= share @@ -36,7 +37,6 @@ IMAKE_FILEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}5/X11 IMAKE_MANNEWSUFFIX= z _DO_SHLIB_CHECKS= yes # fixup PLIST for shared libs -_IMAKE_MAKE= ${MAKE} # program which gets invoked by imake .if exists(/usr/include/netinet6) _OPSYS_HAS_INET6= yes # IPv6 is standard .else diff --git a/mk/platform/Interix.mk b/mk/platform/Interix.mk index ae820a1ea49..da242216446 100644 --- a/mk/platform/Interix.mk +++ b/mk/platform/Interix.mk @@ -1,4 +1,4 @@ -# $NetBSD: Interix.mk,v 1.34 2005/05/22 19:11:15 jlam Exp $ +# $NetBSD: Interix.mk,v 1.35 2005/06/01 18:14:23 jlam Exp $ # # Variable definitions for the Interix operating system. @@ -41,6 +41,7 @@ MANINSTALL= maninstall MAKE_FLAGS+= MKCATPAGES=no NOLINT=1 ECHO_N?= /bin/printf %s # does not support "echo -n" +IMAKE_MAKE?= ${MAKE} # program which gets invoked by imake IMAKEOPTS+= -DBuildHtmlManPages=NO PKGLOCALEDIR?= share PS?= /bin/ps @@ -86,7 +87,6 @@ IMAKE_MISCMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}7 IMAKE_MANNEWSUFFIX= ${IMAKE_MAN_SUFFIX} _DO_SHLIB_CHECKS= yes # fixup PLIST for shared libs/run ldconfig -_IMAKE_MAKE= ${MAKE} # program which gets invoked by imake .if exists(/usr/include/netinet6) _OPSYS_HAS_INET6= yes # IPv6 is standard .else diff --git a/mk/platform/Linux.mk b/mk/platform/Linux.mk index 5f721b24b72..75416233b47 100644 --- a/mk/platform/Linux.mk +++ b/mk/platform/Linux.mk @@ -1,8 +1,9 @@ -# $NetBSD: Linux.mk,v 1.14 2005/05/22 19:11:15 jlam Exp $ +# $NetBSD: Linux.mk,v 1.15 2005/06/01 18:14:23 jlam Exp $ # # Variable definitions for the Linux operating system. ECHO_N?= ${ECHO} -n +IMAKE_MAKE?= ${GMAKE} # program which gets invoked by imake IMAKEOPTS+= -DBuildHtmlManPages=NO PKGLOCALEDIR?= share PS?= /bin/ps @@ -44,9 +45,8 @@ IMAKE_FILEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}5 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_TOOLS= gmake # extra tools required when we use imake -_IMAKE_MAKE= ${GMAKE} # program which gets invoked by imake +_DO_SHLIB_CHECKS= no # on installation, fixup PLIST for shared libs .if exists(/usr/include/netinet6) || exists(/usr/include/linux/in6.h) _OPSYS_HAS_INET6= yes # IPv6 is standard .else diff --git a/mk/platform/NetBSD.mk b/mk/platform/NetBSD.mk index 38b35517a19..2bb5c01c4d6 100644 --- a/mk/platform/NetBSD.mk +++ b/mk/platform/NetBSD.mk @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.mk,v 1.14 2005/06/01 14:23:07 markd Exp $ +# $NetBSD: NetBSD.mk,v 1.15 2005/06/01 18:14:23 jlam Exp $ # # Variable definitions for the NetBSD operating system. @@ -7,6 +7,7 @@ CPP= /usr/bin/cpp .endif ECHO_N?= ${ECHO} -n +IMAKE_MAKE?= ${MAKE} # program which gets invoked by imake PKGLOCALEDIR?= share PS?= /bin/ps RSH?= /usr/bin/rsh @@ -59,7 +60,6 @@ IMAKE_FILEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}5 IMAKE_MISCMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}7 _DO_SHLIB_CHECKS= yes # fixup PLIST for shared libs/run ldconfig -_IMAKE_MAKE= ${MAKE} # program which gets invoked by imake .if exists(/usr/include/netinet6) _OPSYS_HAS_INET6= yes # IPv6 is standard .else diff --git a/mk/platform/OSF1.mk b/mk/platform/OSF1.mk index 80b9b69b1ea..4bce8edfbf1 100644 --- a/mk/platform/OSF1.mk +++ b/mk/platform/OSF1.mk @@ -1,4 +1,4 @@ -# $NetBSD: OSF1.mk,v 1.7 2005/05/22 19:11:15 jlam Exp $ +# $NetBSD: OSF1.mk,v 1.8 2005/06/01 18:14:23 jlam Exp $ # # Variable definitions for the OSF1 operating system. @@ -11,7 +11,8 @@ CPP?= /usr/bin/cpp ECHO_N?= ${SETENV} CMD_ENV=bsd /usr/bin/echo -n -FETCH_CMD?= ${LOCALBASE}/bin/ftp +FETCH_CMD?= ${LOCALBASE}/bin/ftp +IMAKE_MAKE?= ${MAKE} # program which gets invoked by imake PKGLOCALEDIR= share PS?= /bin/ps STRIP?= /usr/bin/strip @@ -46,7 +47,6 @@ IMAKE_FILEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}5 IMAKE_MANNEWSUFFIX= 1 _DO_SHLIB_CHECKS= yes # fixup PLIST -_IMAKE_MAKE= ${MAKE} # program which gets invoked by imake .if exists(/usr/include/netinet/ip6.h) _OPSYS_HAS_INET6= yes # IPv6 is standard .else diff --git a/mk/platform/OpenBSD.mk b/mk/platform/OpenBSD.mk index c39bede8cc8..1cb8a94222a 100644 --- a/mk/platform/OpenBSD.mk +++ b/mk/platform/OpenBSD.mk @@ -1,8 +1,9 @@ -# $NetBSD: OpenBSD.mk,v 1.16 2005/06/01 14:23:07 markd Exp $ +# $NetBSD: OpenBSD.mk,v 1.17 2005/06/01 18:14:23 jlam Exp $ # # Variable definitions for the OpenBSD operating system. ECHO_N?= ${ECHO} -n +IMAKE_MAKE?= ${MAKE} # program which gets invoked by imake PKGLOCALEDIR?= share PS?= /bin/ps # XXX: default from bsd.pkg.defaults.mk. Verify/corerct for this platform @@ -45,7 +46,6 @@ IMAKE_LIBMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}3 IMAKE_FILEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}5 _DO_SHLIB_CHECKS= yes # fixup PLIST for shared libs/run ldconfig -_IMAKE_MAKE= ${MAKE} # program which gets invoked by imake .if exists(/usr/include/netinet6) _OPSYS_HAS_INET6= yes # IPv6 is standard .else diff --git a/mk/platform/SunOS.mk b/mk/platform/SunOS.mk index e65be4131ba..0a93818c662 100644 --- a/mk/platform/SunOS.mk +++ b/mk/platform/SunOS.mk @@ -1,8 +1,9 @@ -# $NetBSD: SunOS.mk,v 1.15 2005/06/01 14:27:12 markd Exp $ +# $NetBSD: SunOS.mk,v 1.16 2005/06/01 18:14:23 jlam Exp $ # # Variable definitions for the SunOS/Solaris operating system. ECHO_N?= ${ECHO} -n +IMAKE_MAKE?= /usr/ccs/bin/make # program which gets invoked by imake PKGLOCALEDIR?= lib PS?= /bin/ps # XXX: default from bsd.pkg.defaults.mk. Verify/corerct for this platform @@ -47,7 +48,6 @@ IMAKE_FILEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}5 IMAKE_MANNEWSUFFIX= ${IMAKE_MAN_SUFFIX} _DO_SHLIB_CHECKS= yes # fixup PLIST for shared libs -_IMAKE_MAKE= /usr/ccs/bin/make # program which gets invoked by imake .if exists(/usr/include/netinet/ip6.h) _OPSYS_HAS_INET6= yes # IPv6 is standard .else diff --git a/mk/platform/UnixWare.mk b/mk/platform/UnixWare.mk index 67979583469..4eb14b039fc 100644 --- a/mk/platform/UnixWare.mk +++ b/mk/platform/UnixWare.mk @@ -1,8 +1,9 @@ -# $NetBSD: UnixWare.mk,v 1.12 2005/05/22 19:11:15 jlam Exp $ +# $NetBSD: UnixWare.mk,v 1.13 2005/06/01 18:14:23 jlam Exp $ # # Variable definitions for the UnixWare 7 operating system. ECHO_N?= ${ECHO} -n +IMAKE_MAKE?= /usr/ccs/bin/make # program which gets invoked by imake PKGLOCALEDIR?= lib PS?= /usr/bin/ps # XXX: default from bsd.pkg.defaults.mk. Verify/corerct for this platform @@ -38,7 +39,6 @@ IMAKE_FILEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}5 IMAKE_MANNEWSUFFIX= ${IMAKE_MAN_SUFFIX} _DO_SHLIB_CHECKS= yes # fixup PLIST for shared libs -_IMAKE_MAKE= /usr/ccs/bin/make # program which gets invoked by imake .if exists(/usr/include/netinet/in6.h) _OPSYS_HAS_INET6= yes # IPv6 is standard .else diff --git a/mk/tools/make.mk b/mk/tools/make.mk index 2494cbbfe1b..f3095e1929c 100644 --- a/mk/tools/make.mk +++ b/mk/tools/make.mk @@ -1,4 +1,4 @@ -# $NetBSD: make.mk,v 1.11 2005/05/21 04:53:17 jlam Exp $ +# $NetBSD: make.mk,v 1.12 2005/06/01 18:14:23 jlam Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -49,8 +49,8 @@ # Define MAKE_PROGRAM to be the "make" used to build the package. .if !empty(_USE_TOOLS:Mgmake) MAKE_PROGRAM= ${GMAKE} -.elif !empty(_USE_TOOLS:Mimake) && defined(_IMAKE_MAKE) -MAKE_PROGRAM= ${_IMAKE_MAKE} +.elif !empty(_USE_TOOLS:Mimake) && defined(IMAKE_MAKE) +MAKE_PROGRAM= ${IMAKE_MAKE} .else MAKE_PROGRAM= ${MAKE} .endif |