diff options
| author | Olli Hauer <ohauer@FreeBSD.org> | 2013-03-02 19:46:37 +0000 |
|---|---|---|
| committer | Olli Hauer <ohauer@FreeBSD.org> | 2013-03-02 19:46:37 +0000 |
| commit | 8a4e4e62663f8d2fd19c61f3e9dd82586ab2fb76 (patch) | |
| tree | 5dfd2499295de39f88baa89ef0b1cc399bae139a /Mk | |
| parent | - update to version 2.2.24 (diff) | |
- allow to install apache modules activated by defining
AP_MODENABLE in make.conf
Requested on the mailing lists
- fix patch location in help text
with head apache@
Notes
Notes:
svn path=/head/; revision=313288
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.apache.mk | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Mk/bsd.apache.mk b/Mk/bsd.apache.mk index 0a87f6162359..fae6bb946619 100644 --- a/Mk/bsd.apache.mk +++ b/Mk/bsd.apache.mk @@ -455,7 +455,11 @@ ap-gen-plist: # apache22 @${ECHO} "@unexec ${SED} -i '' -E '/LoadModule[[:blank:]]+%%AP_NAME%%_module/d' %D/%%APACHEETCDIR%%/httpd.conf" >> ${PLIST} @${ECHO} "%%APACHEMODDIR%%/%%AP_MODULE%%" >> ${PLIST} +.if defined(AP_MODENABLE) + @${ECHO} "@exec %D/sbin/apxs -e -a -n %%AP_NAME%% %D/%F" >> ${PLIST} +.else @${ECHO} "@exec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%F" >> ${PLIST} +.endif @${ECHO} "@unexec echo \"Don't forget to remove all ${MODULENAME}-related directives in your httpd.conf\"">> ${PLIST} . endif .else @@ -470,7 +474,11 @@ do-build: ap-gen-plist .if !target(do-install) do-install: +.if defined(AP_MODENABLE) @${APXS} -i -A -n ${SHORTMODNAME} ${WRKSRC}/${MODULENAME}.${AP_BUILDEXT} +.else + @${APXS} -i -a -n ${SHORTMODNAME} ${WRKSRC}/${MODULENAME}.${AP_BUILDEXT} +.endif .endif .endif .endif |