pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk Turn IMAKE_MAKE into a public variable that may be ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/fdf2c0ea6719
branches:  trunk
changeset: 495008:fdf2c0ea6719
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Jun 01 18:14:23 2005 +0000

description:
Turn IMAKE_MAKE into a public variable that may be set via /etc/mk.conf.

diffstat:

 mk/platform/AIX.mk       |  4 ++--
 mk/platform/BSDOS.mk     |  4 ++--
 mk/platform/Darwin.mk    |  4 ++--
 mk/platform/DragonFly.mk |  4 ++--
 mk/platform/FreeBSD.mk   |  4 ++--
 mk/platform/IRIX.mk      |  4 ++--
 mk/platform/Interix.mk   |  4 ++--
 mk/platform/Linux.mk     |  6 +++---
 mk/platform/NetBSD.mk    |  4 ++--
 mk/platform/OSF1.mk      |  6 +++---
 mk/platform/OpenBSD.mk   |  4 ++--
 mk/platform/SunOS.mk     |  4 ++--
 mk/platform/UnixWare.mk  |  4 ++--
 mk/tools/make.mk         |  6 +++---
 14 files changed, 31 insertions(+), 31 deletions(-)

diffs (truncated from 328 to 300 lines):

diff -r eac6fffa4cf9 -r fdf2c0ea6719 mk/platform/AIX.mk
--- a/mk/platform/AIX.mk        Wed Jun 01 18:02:37 2005 +0000
+++ b/mk/platform/AIX.mk        Wed Jun 01 18:14:23 2005 +0000
@@ -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_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 -r eac6fffa4cf9 -r fdf2c0ea6719 mk/platform/BSDOS.mk
--- a/mk/platform/BSDOS.mk      Wed Jun 01 18:02:37 2005 +0000
+++ b/mk/platform/BSDOS.mk      Wed Jun 01 18:14:23 2005 +0000
@@ -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_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 -r eac6fffa4cf9 -r fdf2c0ea6719 mk/platform/Darwin.mk
--- a/mk/platform/Darwin.mk     Wed Jun 01 18:02:37 2005 +0000
+++ b/mk/platform/Darwin.mk     Wed Jun 01 18:14:23 2005 +0000
@@ -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 @@
 .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_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 -r eac6fffa4cf9 -r fdf2c0ea6719 mk/platform/DragonFly.mk
--- a/mk/platform/DragonFly.mk  Wed Jun 01 18:02:37 2005 +0000
+++ b/mk/platform/DragonFly.mk  Wed Jun 01 18:14:23 2005 +0000
@@ -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_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 -r eac6fffa4cf9 -r fdf2c0ea6719 mk/platform/FreeBSD.mk
--- a/mk/platform/FreeBSD.mk    Wed Jun 01 18:02:37 2005 +0000
+++ b/mk/platform/FreeBSD.mk    Wed Jun 01 18:14:23 2005 +0000
@@ -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_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 -r eac6fffa4cf9 -r fdf2c0ea6719 mk/platform/IRIX.mk
--- a/mk/platform/IRIX.mk       Wed Jun 01 18:02:37 2005 +0000
+++ b/mk/platform/IRIX.mk       Wed Jun 01 18:14:23 2005 +0000
@@ -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_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 -r eac6fffa4cf9 -r fdf2c0ea6719 mk/platform/Interix.mk
--- a/mk/platform/Interix.mk    Wed Jun 01 18:02:37 2005 +0000
+++ b/mk/platform/Interix.mk    Wed Jun 01 18:14:23 2005 +0000
@@ -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 @@
 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_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 -r eac6fffa4cf9 -r fdf2c0ea6719 mk/platform/Linux.mk
--- a/mk/platform/Linux.mk      Wed Jun 01 18:02:37 2005 +0000
+++ b/mk/platform/Linux.mk      Wed Jun 01 18:14:23 2005 +0000
@@ -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_MISCMAN_DIR=     ${IMAKE_MAN_SOURCE_PATH}7
 IMAKE_MANNEWSUFFIX=    ${IMAKE_MAN_SUFFIX}
 
+_IMAKE_TOOLS=          gmake   # extra tools required when we use imake
 _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
 .if exists(/usr/include/netinet6) || exists(/usr/include/linux/in6.h)
 _OPSYS_HAS_INET6=      yes     # IPv6 is standard
 .else
diff -r eac6fffa4cf9 -r fdf2c0ea6719 mk/platform/NetBSD.mk
--- a/mk/platform/NetBSD.mk     Wed Jun 01 18:02:37 2005 +0000
+++ b/mk/platform/NetBSD.mk     Wed Jun 01 18:14:23 2005 +0000
@@ -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_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 -r eac6fffa4cf9 -r fdf2c0ea6719 mk/platform/OSF1.mk
--- a/mk/platform/OSF1.mk       Wed Jun 01 18:02:37 2005 +0000
+++ b/mk/platform/OSF1.mk       Wed Jun 01 18:14:23 2005 +0000
@@ -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_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 -r eac6fffa4cf9 -r fdf2c0ea6719 mk/platform/OpenBSD.mk
--- a/mk/platform/OpenBSD.mk    Wed Jun 01 18:02:37 2005 +0000
+++ b/mk/platform/OpenBSD.mk    Wed Jun 01 18:14:23 2005 +0000
@@ -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_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 -r eac6fffa4cf9 -r fdf2c0ea6719 mk/platform/SunOS.mk
--- a/mk/platform/SunOS.mk      Wed Jun 01 18:02:37 2005 +0000
+++ b/mk/platform/SunOS.mk      Wed Jun 01 18:14:23 2005 +0000
@@ -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_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 -r eac6fffa4cf9 -r fdf2c0ea6719 mk/platform/UnixWare.mk
--- a/mk/platform/UnixWare.mk   Wed Jun 01 18:02:37 2005 +0000
+++ b/mk/platform/UnixWare.mk   Wed Jun 01 18:14:23 2005 +0000
@@ -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



Home | Main Index | Thread Index | Old Index