diff options
| author | jlam <jlam@pkgsrc.org> | 2003-08-26 20:15:23 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2003-08-26 20:15:23 +0000 |
| commit | 9fbdc941fea7d21de5d5b90812f86cfcc394704e (patch) | |
| tree | 8b1c3bab1e6dabee92b179dc0fdf2dc62269e99a /mk/bsd.pkg.mk | |
| parent | 4826d368a2175f7a2e4026e3ee433f5c184ee2a4 (diff) | |
| download | pkgsrc-9fbdc941fea7d21de5d5b90812f86cfcc394704e.tar.gz | |
Create a symlink from the "make" requested by the package into
${TOOLS_DIR}/bin/make. If a package wants GNU make, then it should
set:
USE_GNU_TOOLS+= make
in the package Makefile. Allow for USE_GMAKE to continue to work
until we get a chance to sweep through pkgsrc and remove the usage
of this now-redundant variable.
This change allows us to avoid patching makefiles that use a bare
"make" command to invoke sub-make processes. Idea suggested by
salo@netbsd.org in pkg/22509.
Diffstat (limited to 'mk/bsd.pkg.mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 83be8cab2f7..f39c2e23017 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1245 2003/08/24 08:51:11 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1246 2003/08/26 20:15:23 jlam Exp $ # # This file is in the public domain. # @@ -145,17 +145,24 @@ PKG_FAIL_REASON+= "${PKGNAME} uses imake, but the buildlink-x11 package was foun . endif .endif # USE_IMAKE +.if defined(USE_GNU_TOOLS) && !empty(USE_GNU_TOOLS:Mmake) +_USE_GMAKE= yes +.endif + +# XXX USE_GMAKE is redundant since USE_GNU_TOOLS+=make accomplishes the +# XXX same thing but by using the more general tools.mk framework. This +# XXX variable should eventually be reaped from pkgsrc. +# .if defined(USE_GMAKE) -. if ${_OPSYS_HAS_GMAKE} == "no" -BUILD_DEPENDS+= gmake>=3.78:../../devel/gmake -. endif +_USE_GMAKE= yes +.endif + +.if defined(_USE_GMAKE) MAKE_PROGRAM= ${GMAKE} -.else -. if defined(USE_IMAKE) +.elif defined(USE_IMAKE) MAKE_PROGRAM= ${_IMAKE_MAKE} -. else +.else MAKE_PROGRAM= ${MAKE} -. endif .endif CONFIGURE_ENV+= MAKE="${MAKE_PROGRAM}" @@ -4324,7 +4331,7 @@ fake-pkg: ${PLIST} ${DESCR} ${MESSAGE} . if defined(USE_PERL5) && (${USE_PERL5} == "run") @${ECHO} "PERL=`${PERL5} --version 2>/dev/null | ${GREP} 'This is perl'`" >> ${BUILD_INFO_FILE} . endif -. ifdef USE_GMAKE +. ifdef _USE_GMAKE @${ECHO} "GMAKE=`${GMAKE} --version | ${GREP} Make`" >> ${BUILD_INFO_FILE} . endif . if ${CHECK_SHLIBS} == "YES" |