diff options
| author | Olli Hauer <ohauer@FreeBSD.org> | 2013-11-10 20:45:09 +0000 |
|---|---|---|
| committer | Olli Hauer <ohauer@FreeBSD.org> | 2013-11-10 20:45:09 +0000 |
| commit | 5ecf027efabac87de06919924ec667dda746015c (patch) | |
| tree | a276e8e99f694269a492906d19f090b2a834e958 /Mk/bsd.apache.mk | |
| parent | devel/gps: Convert to staging (diff) | |
- rewrite part of module enabling
Notes
Notes:
svn path=/head/; revision=333447
Diffstat (limited to 'Mk/bsd.apache.mk')
| -rw-r--r-- | Mk/bsd.apache.mk | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/Mk/bsd.apache.mk b/Mk/bsd.apache.mk index d69fafd4ece3..245cc9ab77b0 100644 --- a/Mk/bsd.apache.mk +++ b/Mk/bsd.apache.mk @@ -446,6 +446,13 @@ show-modules: .elif defined(AP_PORT_IS_MODULE) +.if defined(AP_MODENABLE) +AP_MOD_EN= -a +.else +AP_MOD_EN= -A +.endif +PLIST_SUB+= AP_MOD_EN="${AP_MOD_EN}" + .if defined(AP_FAST_BUILD) .if !target(ap-gen-plist) ap-gen-plist: @@ -455,11 +462,7 @@ 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} "@exec %D/sbin/apxs -e ${AP_MOD_EN} -n %%AP_NAME%% %D/%F" >> ${PLIST} @${ECHO} "@unexec echo \"Don't forget to remove all ${MODULENAME}-related directives in your httpd.conf\"">> ${PLIST} . endif .else @@ -474,12 +477,8 @@ 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 + @${APXS} -i ${AP_MOD_EN} -n ${SHORTMODNAME} ${WRKSRC}/${MODULENAME}.${AP_BUILDEXT} .endif +.endif # defined(AP_FAST_BUILD) +.endif # defined(AP_PORT_IS_MODULE) .endif # defined(_POSTMKINCLUDED) && !defined(Apache_Post_Include) |