From 490ffcf406405dcea7bf43ada78a55f618d36077 Mon Sep 17 00:00:00 2001
From: Christian Weisgerber <naddy@FreeBSD.org>
Date: Thu, 20 Jun 2002 11:03:08 +0000
Subject: * Always use /bin/sh for configure and build. * Fix EXPAT_PATHS
 substitution on 4.4.

Submitted by:	maintainer Hye-Shik Chang <perky@fallin.lv>
---
 www/apache21/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'www/apache21/Makefile')

diff --git a/www/apache21/Makefile b/www/apache21/Makefile
index 2002c2a53852..218a4e452bde 100644
--- a/www/apache21/Makefile
+++ b/www/apache21/Makefile
@@ -40,7 +40,7 @@ CONFIGURE_ARGS=	--prefix=${PREFIX_RELDEST} \
 		--libdir=${PREFIX_RELDEST}/lib/apache2 \
 		--includedir=${PREFIX_RELDEST}/include/apache2
 CONFIGURE_ENV=	CC="${CC}" CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" EXPAT_PATHS="${EXPAT_PATHS}"
+		LDFLAGS="${LDFLAGS}" CONFIG_SHELL="${SH}"
 SHARED_MODULES= all cgid ext_filter bucketeer
 PREFIX_RELDEST=	${PREFIX:S,${DESTDIR},,}
 RC_SUB=		-e 's,@@PREFIX@@,${PREFIX_RELDEST},g'
@@ -133,7 +133,7 @@ post-patch:
 	  ${REINPLACE_CMD} -e 's,apache_pb,icons/freebsd.gif" \
 		ALT="[Powered by FreeBSD]"><IMG SRC="apache_pb2_ani,g' $$f \
 	 ); done
-	@${REINPLACE_CMD} -e 's,/usr .*/xml/expat,\$${EXPAT_PATHS},g' \
+	@${REINPLACE_CMD} -e 's,/usr .*/xml/expat,${EXPAT_PATHS},g' \
 		${WRKSRC}/srclib/apr-util/configure
 	@${FIND} ${WRKSRC} \( -name "*.orig" -or -name "*.bak" \) -exec ${RM} -f {} \;
 	@${SED} ${RC_SUB} ${FILESDIR}/apache.sh >${WRKDIR}/apache2.sh
-- 
cgit v1.2.3