diff options
| author | Clement Laforet <clement@FreeBSD.org> | 2007-07-22 10:48:42 +0000 |
|---|---|---|
| committer | Clement Laforet <clement@FreeBSD.org> | 2007-07-22 10:48:42 +0000 |
| commit | 9173d040e4342fba2e410cb8ab3c1d1276579cc5 (patch) | |
| tree | bc185f0936e72c07b67dc58f40e7caf39a0aaef2 /Mk | |
| parent | Build libtonezone.a with -fPIC, which is necessary at least on AMD64 (diff) | |
- fix long standing bugs
* fix pre/post includes
* fix local port overiding for apache > 2.1
* Add a short notr about USE_APACHE=yes
Notes
Notes:
svn path=/head/; revision=196049
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.apache.mk | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/Mk/bsd.apache.mk b/Mk/bsd.apache.mk index 5198e3b0c890..c48a33569359 100644 --- a/Mk/bsd.apache.mk +++ b/Mk/bsd.apache.mk @@ -15,8 +15,15 @@ # <version>: 1.3/13/2.0/20/2.1/2.2/1.3+/2.0+/2.1+/2.2+ # common*: common13, common20, common21 and common22 # +# Note: Setting USE_APACHE to "yes" is deprecated. It will set +# APACHE_PORT to www/apache13 and if WITH_APACHE2 (deprecated too) +# is defined, APACHE_PORT will be set to www/apache20 # -# + +.if !defined(_POSTMKINCLUDED) && !defined(Apache_Pre_Include) + +Apache_Pre_Include= bsd.apache.mk + .if defined(APACHE_COMPAT) USE_APACHE=yes .endif @@ -303,13 +310,13 @@ AP_BUILDEXT= la APACHEMODDIR= libexec/apache2 APACHEINCLUDEDIR=include/apache2 APACHEETCDIR= etc/apache2 -APACHE_PORT= www/apache${APACHE_VERSION} +APACHE_PORT?= www/apache${APACHE_VERSION} .elif ${APACHE_VERSION} >= 21 AP_BUILDEXT= la APACHEMODDIR= libexec/apache${APACHE_VERSION} APACHEINCLUDEDIR=include/apache${APACHE_VERSION} APACHEETCDIR= etc/apache${APACHE_VERSION} -APACHE_PORT= www/apache${APACHE_VERSION} +APACHE_PORT?= www/apache${APACHE_VERSION} .else AP_BUILDEXT= so APACHEMODDIR= libexec/apache @@ -346,6 +353,10 @@ AP_EXTRAS+= -L ${AP_LIB} .endif +.endif #!defined(_POSTMKINCLUDED) && !defined(Apache_Pre_Include) +.if defined(_POSTMKINCLUDED) && !defined(Apache_Post_Include) +Apache_Post_Include= bsd.apache.mk + .if defined(AP_PORT_IS_SERVER) .if !target(print-closest-mirrors) print-closest-mirrors: @@ -412,7 +423,6 @@ do-build: ap-gen-plist do-install: @${APXS} -i -A -n ${SHORTMODNAME} ${WRKSRC}/${MODULENAME}.${AP_BUILDEXT} .endif - .endif - .endif +.endif # defined(_POSTMKINCLUDED) && !defined(Apache_Post_Include) |