diff options
| author | agc <agc> | 2001-11-21 12:53:04 +0000 |
|---|---|---|
| committer | agc <agc> | 2001-11-21 12:53:04 +0000 |
| commit | a7ef36e0c70f7744ac6a1449b14bf1eea82453c0 (patch) | |
| tree | c894a27323e28ab637d53da7676da3ab953f7df1 | |
| parent | 2cc08afac0b7ce553150f1ae8298bc3343ebe77e (diff) | |
| download | pkgsrc-a7ef36e0c70f7744ac6a1449b14bf1eea82453c0.tar.gz | |
Add a definition of _IMAKE_MAKE to the individual defs.${OPSYS}.mk
files, defined to be the make program which is invoked by imake, and
use it accordingly in bsd.pkg.mk
| -rw-r--r-- | mk/bsd.pkg.mk | 6 | ||||
| -rw-r--r-- | mk/defs.Darwin.mk | 4 | ||||
| -rw-r--r-- | mk/defs.Linux.mk | 4 | ||||
| -rw-r--r-- | mk/defs.NetBSD.mk | 4 | ||||
| -rw-r--r-- | mk/defs.SunOS.mk | 4 |
5 files changed, 15 insertions, 7 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index e73e7ac74a3..94e56fbf2b7 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.852 2001/11/21 12:42:23 agc Exp $ +# $NetBSD: bsd.pkg.mk,v 1.853 2001/11/21 12:53:04 agc Exp $ # # This file is in the public domain. # @@ -158,8 +158,8 @@ BUILD_DEPENDS+= gmake>=3.78:../../devel/gmake MAKE_PROGRAM= ${GMAKE} GMAKE?= gmake .else -. if (${OPSYS} == "SunOS") && defined(USE_IMAKE) -MAKE_PROGRAM= /usr/ccs/bin/make +. if defined(USE_IMAKE) +MAKE_PROGRAM= ${_IMAKE_MAKE} . else MAKE_PROGRAM= ${MAKE} . endif diff --git a/mk/defs.Darwin.mk b/mk/defs.Darwin.mk index 9f2e4689a0f..21e96eea8f8 100644 --- a/mk/defs.Darwin.mk +++ b/mk/defs.Darwin.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.Darwin.mk,v 1.5 2001/11/21 12:42:24 agc Exp $ +# $NetBSD: defs.Darwin.mk,v 1.6 2001/11/21 12:53:05 agc Exp $ # # Variable definitions for the Darwin operating system. @@ -58,3 +58,5 @@ USERADD?= ${FALSE} # XXX - Fix me! ROOT_USER?= root ROOT_GROUP?= wheel + +_IMAKE_MAKE= ${MAKE} # program which gets invoked by imake diff --git a/mk/defs.Linux.mk b/mk/defs.Linux.mk index d63bc1f798d..70ffc693a20 100644 --- a/mk/defs.Linux.mk +++ b/mk/defs.Linux.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.Linux.mk,v 1.11 2001/11/21 12:42:24 agc Exp $ +# $NetBSD: defs.Linux.mk,v 1.12 2001/11/21 12:53:05 agc Exp $ # # Variable definitions for the Linux operating system. @@ -62,3 +62,5 @@ USERADD?= /usr/sbin/useradd ROOT_USER?= root ROOT_GROUP?= wheel + +_IMAKE_MAKE= ${MAKE} # program which gets invoked by imake diff --git a/mk/defs.NetBSD.mk b/mk/defs.NetBSD.mk index 6ce1b0b5341..81dfefdcd6b 100644 --- a/mk/defs.NetBSD.mk +++ b/mk/defs.NetBSD.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.NetBSD.mk,v 1.9 2001/11/21 12:42:24 agc Exp $ +# $NetBSD: defs.NetBSD.mk,v 1.10 2001/11/21 12:53:05 agc Exp $ # # Variable definitions for the NetBSD operating system. @@ -67,3 +67,5 @@ NOLOGIN?= /sbin/nologin ROOT_USER?= root ROOT_GROUP?= wheel + +_IMAKE_MAKE= ${MAKE} # program which gets invoked by imake diff --git a/mk/defs.SunOS.mk b/mk/defs.SunOS.mk index 9f6b5f4aa3e..7a5c3f147a7 100644 --- a/mk/defs.SunOS.mk +++ b/mk/defs.SunOS.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.SunOS.mk,v 1.8 2001/11/21 12:42:24 agc Exp $ +# $NetBSD: defs.SunOS.mk,v 1.9 2001/11/21 12:53:05 agc Exp $ # # Variable definitions for the SunOS/Solaris operating system. @@ -69,3 +69,5 @@ USERADD?= /usr/sbin/useradd ROOT_USER?= root ROOT_GROUP?= root + +_IMAKE_MAKE= /usr/ccs/bin/make # program which gets invoked by imake |