pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/www/ap-scgi Fix build with Apache 1.3.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/19d9203141d0
branches:  trunk
changeset: 560921:19d9203141d0
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Jul 06 16:05:45 2009 +0000

description:
Fix build with Apache 1.3.

diffstat:

 www/ap-scgi/Makefile |  21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)

diffs (37 lines):

diff -r 2909444c9aca -r 19d9203141d0 www/ap-scgi/Makefile
--- a/www/ap-scgi/Makefile      Mon Jul 06 15:22:14 2009 +0000
+++ b/www/ap-scgi/Makefile      Mon Jul 06 16:05:45 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/03/07 16:26:16 tnn Exp $
+# $NetBSD: Makefile,v 1.4 2009/07/06 16:05:45 joerg Exp $
 #
 
 PKGNAME=       ${APACHE_PKG_PREFIX}-${DISTNAME}
@@ -12,13 +12,22 @@
 APACHE_MODULE= yes
 .include "../../mk/apache.mk"
 
-do-build:
-       cd ${WRKSRC}/apache${APACHE_PKG_PREFIX:C/^ap(2)?.*/\1/} && \
-       ${APXS} -c mod_scgi.c
+.if ${APACHE_PKG_PREFIX} == "ap13"
+WRKSRC=        ${WRKDIR}/${DISTNAME}/apache1
+.else
+WRKSRC=        ${WRKDIR}/${DISTNAME}/apache2
+.endif
 
+do-build:
+       cd ${WRKSRC} && ${APXS} -c mod_scgi.c
+
+.if ${APACHE_PKG_PREFIX} == "ap13"
 do-install:
-       cd ${WRKSRC}/apache${APACHE_PKG_PREFIX:C/^ap(2)?.*/\1/} && \
-       ${APXS} -i mod_scgi.la
+       cd ${WRKSRC} && ${APXS} -i mod_scgi.so
+.else
+do-install:
+       cd ${WRKSRC} && ${APXS} -i mod_scgi.la
+.endif
 
 .include "../../lang/python/pyversion.mk"
 .include "../../www/py-scgi/Makefile.common"



Home | Main Index | Thread Index | Old Index