From c36c607e27a4de025f61c1b99b594cbae1cab37e Mon Sep 17 00:00:00 2001 From: Clement Laforet Date: Sun, 11 Jul 2004 09:43:17 +0000 Subject: - Improve plist generation. It fixes problems when you deinstall a port with $PREFIX != $(apxs -q prefix). Now plist is aware of real location of apache module. --- www/apache20/Makefile.modules.3rd | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'www/apache20') diff --git a/www/apache20/Makefile.modules.3rd b/www/apache20/Makefile.modules.3rd index 9e3a5700c2e5..b73c7018e9b3 100644 --- a/www/apache20/Makefile.modules.3rd +++ b/www/apache20/Makefile.modules.3rd @@ -79,17 +79,28 @@ AP_EXTRAS+= -I ${AP_INC} AP_EXTRAS+= -L ${AP_LIB} .endif +.if exists(${APXS}) +APXS_PREFIX!= ${APXS} -q prefix +.else +APXS_PREFIX= ${APXS:S/\/sbin\/apxs//} +.endif + .if defined(AP_FAST_BUILD) ap-gen-plist: .if defined(AP_GENPLIST) +. if !exists(${PLIST}) @${ECHO} "===> Generating apache plist" - @${ECHO} "@unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%%APACHEMODDIR%%/%%AP_MODULE%%" > ${PLIST} + @${ECHO} "@cwd ${APXS_PREFIX}" > ${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} "@cwd ${PREFIX}" >> ${PLIST} +. endif .else @${DO_NADA} .endif + do-build: ap-gen-plist @cd ${WRKSRC} && ${APXS} -c ${AP_EXTRAS} -o ${MODULENAME}.${AP_BUILDEXT} ${SRC_FILE} -- cgit v1.2.3