diff options
| author | Olli Hauer <ohauer@FreeBSD.org> | 2014-08-09 18:21:59 +0000 |
|---|---|---|
| committer | Olli Hauer <ohauer@FreeBSD.org> | 2014-08-09 18:21:59 +0000 |
| commit | ef8909b7d9f943aff9e8608738c9d6882cdf1ede (patch) | |
| tree | 3545aa41adbcefa7ab4f25731a9eaf93d555854f /Mk/bsd.apache.mk | |
| parent | bca2a1abb7d9504d1c4aed1a93ec27017246908b (diff) | |
| download | ports-ef8909b7d9f943aff9e8608738c9d6882cdf1ede.tar.gz ports-ef8909b7d9f943aff9e8608738c9d6882cdf1ede.zip | |
Notes
Diffstat (limited to 'Mk/bsd.apache.mk')
| -rw-r--r-- | Mk/bsd.apache.mk | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/Mk/bsd.apache.mk b/Mk/bsd.apache.mk index fcec31b2a10a..7757d37d3085 100644 --- a/Mk/bsd.apache.mk +++ b/Mk/bsd.apache.mk @@ -348,9 +348,15 @@ APACHE_PORT?= www/apache${APACHE_VERSION} PLIST_SUB+= APACHEMODDIR="${APACHEMODDIR}" \ APACHEINCLUDEDIR="${APACHEINCLUDEDIR}" \ - APACHEETCDIR="${APACHEETCDIR}" + APACHEETCDIR="${APACHEETCDIR}" \ + APACHE_VERSION="${APACHE_VERSION}" + +SUB_LIST+= APACHEMODDIR="${APACHEMODDIR}" \ + APACHEETCDIR="${APACHEETCDIR}" \ + APACHE_VERSION="${APACHE_VERSION}" APACHE_PKGNAMEPREFIX= ap${APACHE_VERSION}- + .if defined(AP_FAST_BUILD) PKGNAMEPREFIX?= ${APACHE_PKGNAMEPREFIX} .endif @@ -462,7 +468,6 @@ ap-gen-plist: .if defined(AP_GENPLIST) . if !exists(${PLIST}) @${ECHO} "===> Generating apache plist" -# apache22 @${ECHO} "@unexec ${SED} -i '' -E '/LoadModule[[:blank:]]+%%AP_NAME%%_module/d' %D/%%APACHEETCDIR%%/httpd.conf" >> ${PLIST} @${ECHO} "%%APACHEMODDIR%%/%%AP_MODULE%%" >> ${PLIST} @${ECHO} "@exec %D/sbin/apxs -e ${AP_MOD_EN} -n %%AP_NAME%% %D/%F" >> ${PLIST} @@ -493,6 +498,7 @@ do-install: . endif . endif .endif + .endif # defined(AP_FAST_BUILD) -.endif # defined(AP_PORT_IS_MODULE) +.endif # defined(AP_PORT_IS_SERVER / AP_PORT_IS_MODULE) .endif # defined(_POSTMKINCLUDED) && !defined(Apache_Post_Include) |