From 9728f3a0ac4296f2e7d8531bf4a6cc325b909a97 Mon Sep 17 00:00:00 2001 From: Clement Laforet Date: Sat, 17 Apr 2004 14:26:01 +0000 Subject: - 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] --- www/apache2/Makefile.modules.3rd | 6 +++--- www/apache20/Makefile.modules.3rd | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'www') 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 -- cgit v1.2.3