summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortron <tron>2001-06-07 15:34:16 +0000
committertron <tron>2001-06-07 15:34:16 +0000
commitfcf8eb06aca360413ae3d92dc16f2ccd3eaf0da0 (patch)
treee1bbf594f766a2c37a422473e512bf6208b25884
parentc716d5f58362852f39cc4e010fecdedba38c2d27 (diff)
downloadpkgsrc-fcf8eb06aca360413ae3d92dc16f2ccd3eaf0da0.tar.gz
Use "/usr/ccs/bin/make" under Solaris if "USE_IMAKE" is defined.
-rw-r--r--mk/bsd.pkg.mk9
1 files changed, 6 insertions, 3 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index e38f6158955..524f55380f1 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.749 2001/05/24 19:39:55 skrll Exp $
+# $NetBSD: bsd.pkg.mk,v 1.750 2001/06/07 15:34:16 tron Exp $
#
# This file is in the public domain.
#
@@ -123,12 +123,17 @@ MOTIFBASE?= ${X11PREFIX}
.endif
.endif # USE_MOTIF
+MAKE_PROGRAM= ${MAKE}
+
.if defined(USE_IMAKE) || defined(USE_MOTIF) || defined(USE_X11BASE)
.if exists(${LOCALBASE}/lib/X11/config/xpkgwedge.def) || \
exists(${X11BASE}/lib/X11/config/xpkgwedge.def)
BUILD_DEPENDS+= xpkgwedge>=1.0:../../pkgtools/xpkgwedge
.endif
PREFIX= ${X11PREFIX}
+.if (${OPSYS} == "SunOS")
+MAKE_PROGRAM= /usr/ccs/bin/make
+.endif
.elif defined(USE_CROSSBASE)
PREFIX= ${CROSSBASE}
NO_MTREE= yes
@@ -140,8 +145,6 @@ PREFIX= ${LOCALBASE}
BUILD_DEPENDS+= gmake>=3.78:../../devel/gmake
MAKE_PROGRAM= ${GMAKE}
GMAKE?= gmake
-.else
-MAKE_PROGRAM= ${MAKE}
.endif
CONFIGURE_ENV+= MAKE="${MAKE_PROGRAM}"