diff options
| author | tron <tron> | 2001-06-07 15:40:15 +0000 |
|---|---|---|
| committer | tron <tron> | 2001-06-07 15:40:15 +0000 |
| commit | c763a48da39d73e42947f2fcf3e6f2f5de954c81 (patch) | |
| tree | 827e60e96d6762f66e3805dadd7f25820d6806c8 /mk | |
| parent | 0d7bea5d0b3b05646775c63f21dfaced8e34e5f7 (diff) | |
| download | pkgsrc-c763a48da39d73e42947f2fcf3e6f2f5de954c81.tar.gz | |
Fix thinko in last commit.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 524f55380f1..1eff9832e44 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.750 2001/06/07 15:34:16 tron Exp $ +# $NetBSD: bsd.pkg.mk,v 1.751 2001/06/07 15:40:15 tron Exp $ # # This file is in the public domain. # @@ -123,17 +123,12 @@ 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 @@ -145,6 +140,12 @@ PREFIX= ${LOCALBASE} 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 +.else +MAKE_PROGRAM= ${MAKE} +.endif .endif CONFIGURE_ENV+= MAKE="${MAKE_PROGRAM}" |