diff options
Diffstat (limited to 'mk/apache.mk')
| -rw-r--r-- | mk/apache.mk | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/mk/apache.mk b/mk/apache.mk index 57aaf9630af..028dd5daed2 100644 --- a/mk/apache.mk +++ b/mk/apache.mk @@ -1,4 +1,4 @@ -# $NetBSD: apache.mk,v 1.7 2005/01/03 13:20:28 seb Exp $ +# $NetBSD: apache.mk,v 1.8 2005/03/24 17:46:00 tv Exp $ # # This Makefile fragment handles Apache dependencies and make variables, # and is meant to be included by packages that require Apache either at @@ -120,36 +120,20 @@ _APACHE_BL_SRCDIR= ${_APACHE_PKGSRCDIR} _APACHE_BL_SRCDIR?= ../../www/apache -_APACHE_DEPENDENCY?= ${BUILDLINK_DEPENDS.${_PKG_APACHE}}:${_APACHE_PKGSRCDIR} - # Add a runtime dependency on the apache server. # This may or may not create an actual dependency depending on # what the apache buildlink[23].mk file does. # .if defined(_APACHE_PKGSRCDIR) -. if defined(USE_BUILDLINK3) && empty(USE_BUILDLINK3:M[nN][oO]) -. include "${_APACHE_BL_SRCDIR}/buildlink3.mk" -. else -DEPENDS+= ${_APACHE_DEPENDENCY} -. endif +. include "${_APACHE_BL_SRCDIR}/buildlink3.mk" .endif # If we are building apache modules, then we might need a build-time # dependency on apr, and the apache sources? # -.if defined(_APACHE_PKGSRCDIR) -. if defined(USE_BUILDLINK3) && empty(USE_BUILDLINK3:M[nN][oO]) -. include "${_APACHE_BL_SRCDIR}/buildlink3.mk" -. else -BUILD_DEPENDS+= ${_APACHE_DEPENDENCY} -. endif -.endif - .if ${_PKG_APACHE} == "apache2" . if defined(USE_APR) && !empty(USE_APR:M[yY][eE][sS]) -. if defined(USE_BUILDLINK3) && empty(USE_BUILDLINK3:M[nN][oO]) -. include "../../devel/apr/buildlink3.mk" -. endif +. include "../../devel/apr/buildlink3.mk" . endif .endif |