[Midnightbsd-cvs] mports: apache.mk: fix some of the problems with fake and apache modules

[ctriv at midnightbsd.org]

Log Message:
-----------
fix some of the problems with fake and apache modules built with apxs.

Modified Files:
--------------
    mports/Mk/extensions:
        apache.mk (r1.1 -> r1.2)

-------------- next part --------------
Index: apache.mk
===================================================================
RCS file: /home/cvs/mports/Mk/extensions/apache.mk,v
retrieving revision 1.1
retrieving revision 1.2
diff -L Mk/extensions/apache.mk -L Mk/extensions/apache.mk -u -r1.1 -r1.2
--- Mk/extensions/apache.mk
+++ Mk/extensions/apache.mk
@@ -261,7 +261,7 @@
 IGNORE=	: Your apache does not support DSO modules
 .   endif
 .   if defined(AP_GENPLIST) && ${APXS_PREFIX} != ${PREFIX}
-IGNORE?=	PREFIX must be equal to APXS_PREFIX.
+IGNORE?=	PREFIX (${$PREFIX}) must be equal to APXS_PREFIX (${APXS_PREFIX})
 .   endif
 .endif
 
@@ -270,12 +270,14 @@
 APACHEMODDIR=	libexec/apache2
 APACHEINCLUDEDIR=include/apache2
 APACHEETCDIR=	etc/apache2
+APACHEBUILDDIR=	share/apache2/build
 APACHE_PORT?=	www/apache${APACHE_VERSION}
 .else
 AP_BUILDEXT=	la
 APACHEMODDIR=	libexec/apache${APACHE_VERSION}
 APACHEINCLUDEDIR=include/apache${APACHE_VERSION}
 APACHEETCDIR=	etc/apache${APACHE_VERSION}
+APACHEBUILDDIR=	share/apache${APACHE_VERSION}/build
 APACHE_PORT?=	www/apache${APACHE_VERSION}
 .endif
 
@@ -348,6 +350,9 @@
 
 .elif defined(AP_PORT_IS_MODULE)
 
+APR_CONFIG!=	${APXS} -q APR_CONFIG
+AP_LIBTOOL!=	${APR_CONFIG} --apr-libtool
+
 .if defined(AP_FAST_BUILD)
 .if !target(ap-gen-plist)
 ap-gen-plist:
@@ -371,7 +376,8 @@
 
 .if !target(do-install)
 do-install:
-	@${APXS} -i -A -n ${SHORTMODNAME} ${WRKSRC}/${MODULENAME}.${AP_BUILDEXT}
+	${MKDIR} ${PREFIX}/${APACHEMODDIR}
+	${TRUE_PREFIX}/${APACHEBUILDDIR}/instdso.sh SH_LIBTOOL=${AP_LIBTOOL} ${WRKSRC}/${MODULENAME}.${AP_BUILDEXT} ${PREFIX}/${APACHEMODDIR}
 .endif
 
 .endif