diff options
| author | wiz <wiz@pkgsrc.org> | 2011-03-12 14:07:13 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2011-03-12 14:07:13 +0000 |
| commit | 258be2274052edafd720eee842c26b2a7a42fa97 (patch) | |
| tree | 6b9cc97371ecb51ea0fbb7eb17a5b94d554cdbdb /mk | |
| parent | cb7ed6de116ad894998940a7c1e5e61ee18d09dc (diff) | |
| download | pkgsrc-258be2274052edafd720eee842c26b2a7a42fa97.tar.gz | |
Add MULTI variable, and add it to BUILD_DEFS, to more easily find
variable settings affecting binary packages.
From Aleksey Cheusov in PR 44695.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/apache.mk | 6 | ||||
| -rw-r--r-- | mk/bsd.pkg.mk | 9 |
2 files changed, 13 insertions, 2 deletions
diff --git a/mk/apache.mk b/mk/apache.mk index f815df51f7e..0d7972f5e98 100644 --- a/mk/apache.mk +++ b/mk/apache.mk @@ -1,4 +1,4 @@ -# $NetBSD: apache.mk,v 1.25 2007/12/17 22:09:58 tron Exp $ +# $NetBSD: apache.mk,v 1.26 2011/03/12 14:07:13 wiz Exp $ # # This file is meant to be included by packages that require an apache # web server. @@ -135,4 +135,8 @@ APACHE_PKG_PREFIX= ${_APACHE_PKG_PREFIX.${PKG_APACHE}} . include "../../devel/apr-util/buildlink3.mk" .endif +# +# Variable assignment for multi-apache packages +MULTI+= PKG_APACHE=${PKG_APACHE} + .endif # APACHE_MK diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 3317ed1d970..8fdbf22308d 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1976 2011/02/07 10:32:32 wiz Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1977 2011/03/12 14:07:13 wiz Exp $ # # This file is in the public domain. # @@ -205,6 +205,13 @@ _BUILD_DEFS+= PKG_OPTIONS PKG_FAIL_REASON+= "DEPOT_SUBDIR may not be empty." .endif +# Store the build options for multi-packages, i.e. packages that can +# be built with multiple versions of Apache, Python, Ruby, PHP etc. +# +.if defined(MULTI) +_BUILD_DEFS+= MULTI +.endif + # ZERO_FILESIZE_P exits with a successful return code if the given file # has zero length. # NONZERO_FILESIZE_P exits with a successful return code if the given file |