diff options
| author | clement <clement@FreeBSD.org> | 2004-04-17 22:26:01 +0800 |
|---|---|---|
| committer | clement <clement@FreeBSD.org> | 2004-04-17 22:26:01 +0800 |
| commit | 583bb61e9c6824c85124d1c89c16babab6737926 (patch) | |
| tree | 0b1d8803f5fd70a47169e51cf7243533fa83f5eb /www | |
| parent | eba71f11a8ca5b23d2cd9fad7d6c1870facbfd22 (diff) | |
| download | freebsd-ports-gnome-583bb61e9c6824c85124d1c89c16babab6737926.tar.gz freebsd-ports-gnome-583bb61e9c6824c85124d1c89c16babab6737926.tar.zst freebsd-ports-gnome-583bb61e9c6824c85124d1c89c16babab6737926.zip | |
- Do not activate module automatically [1]
- Cosmectic change in autogenerated plist (run apxs before the removal
of the module file, it can make apxs fail if you change module
name/shortname)
Forgotten by: me [1]
Reminded by: discussion with kris [1]
Diffstat (limited to 'www')
| -rw-r--r-- | www/apache2/Makefile.modules.3rd | 6 | ||||
| -rw-r--r-- | www/apache20/Makefile.modules.3rd | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/www/apache2/Makefile.modules.3rd b/www/apache2/Makefile.modules.3rd index 1367a8e8db5b..82e52774e654 100644 --- a/www/apache2/Makefile.modules.3rd +++ b/www/apache2/Makefile.modules.3rd @@ -84,9 +84,9 @@ AP_EXTRAS+= -L ${AP_LIB} ap-gen-plist: .if defined(AP_GENPLIST) @${ECHO} "===> Generating apache plist" - @${ECHO} "%%APACHEMODDIR%%/%%AP_MODULE%%" > ${PLIST} + @${ECHO} "@unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%%APACHEMODDIR%%/%%AP_MODULE%%" > ${PLIST} + @${ECHO} "%%APACHEMODDIR%%/%%AP_MODULE%%" >> ${PLIST} @${ECHO} "@exec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%F" >> ${PLIST} - @${ECHO} "@unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%F" >> ${PLIST} .else @${DO_NADA} .endif @@ -94,5 +94,5 @@ do-build: ap-gen-plist @cd ${WRKSRC} && ${APXS} -c ${AP_EXTRAS} -o ${MODULENAME}.${AP_BUILDEXT} ${SRC_FILE} do-install: - @${APXS} -i -a -n ${SHORTMODNAME} ${WRKSRC}/${MODULENAME}.${AP_BUILDEXT} + @${APXS} -i -A -n ${SHORTMODNAME} ${WRKSRC}/${MODULENAME}.${AP_BUILDEXT} .endif diff --git a/www/apache20/Makefile.modules.3rd b/www/apache20/Makefile.modules.3rd index 1367a8e8db5b..82e52774e654 100644 --- a/www/apache20/Makefile.modules.3rd +++ b/www/apache20/Makefile.modules.3rd @@ -84,9 +84,9 @@ AP_EXTRAS+= -L ${AP_LIB} ap-gen-plist: .if defined(AP_GENPLIST) @${ECHO} "===> Generating apache plist" - @${ECHO} "%%APACHEMODDIR%%/%%AP_MODULE%%" > ${PLIST} + @${ECHO} "@unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%%APACHEMODDIR%%/%%AP_MODULE%%" > ${PLIST} + @${ECHO} "%%APACHEMODDIR%%/%%AP_MODULE%%" >> ${PLIST} @${ECHO} "@exec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%F" >> ${PLIST} - @${ECHO} "@unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%F" >> ${PLIST} .else @${DO_NADA} .endif @@ -94,5 +94,5 @@ do-build: ap-gen-plist @cd ${WRKSRC} && ${APXS} -c ${AP_EXTRAS} -o ${MODULENAME}.${AP_BUILDEXT} ${SRC_FILE} do-install: - @${APXS} -i -a -n ${SHORTMODNAME} ${WRKSRC}/${MODULENAME}.${AP_BUILDEXT} + @${APXS} -i -A -n ${SHORTMODNAME} ${WRKSRC}/${MODULENAME}.${AP_BUILDEXT} .endif |