diff options
| author | tv <tv@pkgsrc.org> | 2006-04-24 20:10:02 +0000 |
|---|---|---|
| committer | tv <tv@pkgsrc.org> | 2006-04-24 20:10:02 +0000 |
| commit | 9bee330e304f6ae69dbc0f33b6172df7f34f4098 (patch) | |
| tree | f19637031b80d1ce6c702f1108005f7a7601cc20 /www/apache2 | |
| parent | 6eda7a299b32def65d82cadf2bd4d59247ad3a51 (diff) | |
| download | pkgsrc-9bee330e304f6ae69dbc0f33b6172df7f34f4098.tar.gz | |
Set APACHE_MODULES with ?= *before* bsd.prefs.mk, because that's the only
way that using APACHE_MODULES+= (additive) in mk.conf can work correctly.
Diffstat (limited to 'www/apache2')
| -rw-r--r-- | www/apache2/Makefile | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/www/apache2/Makefile b/www/apache2/Makefile index 326e0c9adec..f5bff945764 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.99 2006/04/23 11:42:38 adrianp Exp $ +# $NetBSD: Makefile,v 1.100 2006/04/24 20:10:02 tv Exp $ .include "Makefile.common" @@ -29,6 +29,12 @@ CONFIGURE_ARGS+= --with-apr-util=${BUILDLINK_PREFIX.apr} BUILDLINK_API_DEPENDS.apr+= apr>=0.9.7.2.0.55 +# the following must be set before bsd.prefs.mk in order to make += work +# in mk.conf; however, it isn't expanded until referenced, so we can +# define DFLT_APACHE_MODULES later +# +APACHE_MODULES?= ${DFLT_APACHE_MODULES} + .include "../../mk/bsd.prefs.mk" .include "../../devel/apr/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" @@ -81,7 +87,6 @@ DFLT_APACHE_MODULES+= ldap auth_ldap # APACHE_MODULES are the modules that are linked statically into the # apache httpd executable. # -APACHE_MODULES?= ${DFLT_APACHE_MODULES} CONFIGURE_ARGS+= --enable-modules=${APACHE_MODULES:Q} BUILD_DEFS+= APACHE_MODULES |