diff options
| author | wiz <wiz@pkgsrc.org> | 2011-04-05 12:42:06 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2011-04-05 12:42:06 +0000 |
| commit | a1261d13844a4c4b535f6da4d0b2c6a52017dc89 (patch) | |
| tree | e6f4ba5844851723e604350a0f47421931f911ce | |
| parent | 02272098a8706a1db3cfbfddb1c97b7a525dafd2 (diff) | |
| download | pkgsrc-a1261d13844a4c4b535f6da4d0b2c6a52017dc89.tar.gz | |
Make MAKE_PROGRAM overridable by packages.
From Aleksey Cheusov in PR 44696.
| -rw-r--r-- | mk/tools/make.mk | 4 | ||||
| -rw-r--r-- | pkgtools/pkglint/files/makevars.map | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mk/tools/make.mk b/mk/tools/make.mk index 4414a75029d..cc0567ebb83 100644 --- a/mk/tools/make.mk +++ b/mk/tools/make.mk @@ -1,4 +1,4 @@ -# $NetBSD: make.mk,v 1.13 2005/07/17 21:36:24 jlam Exp $ +# $NetBSD: make.mk,v 1.14 2011/04/05 12:42:06 wiz Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -52,7 +52,7 @@ MAKE_PROGRAM= ${GMAKE} .elif !empty(_USE_TOOLS:Mimake) && defined(IMAKE_MAKE) MAKE_PROGRAM= ${IMAKE_MAKE} .else -MAKE_PROGRAM= ${MAKE} +MAKE_PROGRAM?= ${MAKE} .endif TOOLS_CREATE+= make diff --git a/pkgtools/pkglint/files/makevars.map b/pkgtools/pkglint/files/makevars.map index 7b6d5446034..68346cdfde5 100644 --- a/pkgtools/pkglint/files/makevars.map +++ b/pkgtools/pkglint/files/makevars.map @@ -1,4 +1,4 @@ -# $NetBSD: makevars.map,v 1.208 2011/02/10 12:08:04 adam Exp $ +# $NetBSD: makevars.map,v 1.209 2011/04/05 12:42:06 wiz Exp $ # # This file contains the guessed type of some variables, according to @@ -435,7 +435,7 @@ MAKE_FILE Pathname [$package] MAKE_FLAGS List of ShellWord [$package_list] MAKE_JOBS Integer [$user] MAKE_JOBS_SAFE YesNo [$package] -MAKE_PROGRAM ShellCommand [$system] +MAKE_PROGRAM ShellCommand [$package] MANCOMPRESSED YesNo [m:s,c:ds] MANCOMPRESSED_IF_MANZ Yes [m:s,c:ds] MANGRP UserGroupName [$system] |