From 6ac4aad38f82dd650bf32ac1e3a0aaf9587e7212 Mon Sep 17 00:00:00 2001
From: Dirk Froemberg <dirk@FreeBSD.org>
Date: Mon, 30 Aug 1999 10:56:07 +0000
Subject: Make sure directory ${WRKDIRPREFIX}${CURDIR} exists before touching
 files in that directory. Problem only occurs when ${WRKDIRPREFIX} is set.

Found by:	bento.freebsd.org
---
 www/mod_php3/Makefile              | 5 +++--
 www/mod_php3/scripts/configure.php | 3 ++-
 www/mod_php4/Makefile              | 5 +++--
 www/mod_php4/scripts/configure.php | 3 ++-
 www/mod_php5/Makefile              | 5 +++--
 www/mod_php5/scripts/configure.php | 3 ++-
 6 files changed, 15 insertions(+), 9 deletions(-)

(limited to 'www')

diff --git a/www/mod_php3/Makefile b/www/mod_php3/Makefile
index 40a7801757f3..15eb8758ff6e 100644
--- a/www/mod_php3/Makefile
+++ b/www/mod_php3/Makefile
@@ -3,7 +3,7 @@
 # Date created:		So  21 Jun 1998 16:09:39 CEST
 # Whom:			Stefan Herrmann <stefan@asterix.webaffairs.net>
 #
-# $Id: Makefile,v 1.89 1999/08/26 09:24:16 dirk Exp $
+# $Id: Makefile,v 1.90 1999/08/26 21:18:12 dirk Exp $
 #
 
 DISTNAME=	apache_${VERSION_APACHE}
@@ -88,7 +88,8 @@ CFLAGS+=	-O6 -funroll-loops -fstrength-reduce -fomit-frame-pointer \
 
 CONFIGURE_ENV=	OPTIM='${OPTIM}' LIBS='-L${PREFIX}/lib'
 SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
-		TOUCH="${TOUCH}"
+		TOUCH="${TOUCH}" \
+		MKDIR="${MKDIR}"
 
 INSTALL_TARGET=	install-quiet
 
diff --git a/www/mod_php3/scripts/configure.php b/www/mod_php3/scripts/configure.php
index 362712401742..7464fe2a3de3 100644
--- a/www/mod_php3/scripts/configure.php
+++ b/www/mod_php3/scripts/configure.php
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 if [ "${BATCH}" ]; then
+	${MKDIR} ${WRKDIRPREFIX}${CURDIR}
 	${TOUCH} ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 	exit
 fi
@@ -46,7 +47,7 @@ case $retval in
 		;;
 esac
 
-mkdir -p ${WRKDIRPREFIX}${CURDIR}
+${MKDIR} -p ${WRKDIRPREFIX}${CURDIR}
 exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 
 while [ "$1" ]; do
diff --git a/www/mod_php4/Makefile b/www/mod_php4/Makefile
index c09e6393f9b9..03e39d310d0a 100644
--- a/www/mod_php4/Makefile
+++ b/www/mod_php4/Makefile
@@ -3,7 +3,7 @@
 # Date created:		So  21 Jun 1998 16:09:39 CEST
 # Whom:			Stefan Herrmann <stefan@asterix.webaffairs.net>
 #
-# $Id: Makefile,v 1.91 1999/08/22 19:00:28 mharo Exp $
+# $Id: Makefile,v 1.92 1999/08/26 21:18:14 dirk Exp $
 #
 
 DISTNAME=	apache_${VERSION_APACHE}
@@ -86,7 +86,8 @@ CFLAGS+=	-O6 -funroll-loops -fstrength-reduce -fomit-frame-pointer \
 
 CONFIGURE_ENV=	OPTIM='${OPTIM}' LIBS='-L${PREFIX}/lib'
 SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
-		TOUCH="${TOUCH}"
+		TOUCH="${TOUCH}" \
+		MKDIR="${MKDIR}"
 
 INSTALL_TARGET=	install-quiet
 
diff --git a/www/mod_php4/scripts/configure.php b/www/mod_php4/scripts/configure.php
index b47d631fe964..f8413f6948a6 100644
--- a/www/mod_php4/scripts/configure.php
+++ b/www/mod_php4/scripts/configure.php
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 if [ "${BATCH}" ]; then
+	${MKDIR} ${WRKDIRPREFIX}${CURDIR}
 	${TOUCH} ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 	exit
 fi
@@ -46,7 +47,7 @@ case $retval in
 		;;
 esac
 
-mkdir -p ${WRKDIRPREFIX}${CURDIR}
+${MKDIR} ${WRKDIRPREFIX}${CURDIR}
 exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 
 while [ "$1" ]; do
diff --git a/www/mod_php5/Makefile b/www/mod_php5/Makefile
index c09e6393f9b9..03e39d310d0a 100644
--- a/www/mod_php5/Makefile
+++ b/www/mod_php5/Makefile
@@ -3,7 +3,7 @@
 # Date created:		So  21 Jun 1998 16:09:39 CEST
 # Whom:			Stefan Herrmann <stefan@asterix.webaffairs.net>
 #
-# $Id: Makefile,v 1.91 1999/08/22 19:00:28 mharo Exp $
+# $Id: Makefile,v 1.92 1999/08/26 21:18:14 dirk Exp $
 #
 
 DISTNAME=	apache_${VERSION_APACHE}
@@ -86,7 +86,8 @@ CFLAGS+=	-O6 -funroll-loops -fstrength-reduce -fomit-frame-pointer \
 
 CONFIGURE_ENV=	OPTIM='${OPTIM}' LIBS='-L${PREFIX}/lib'
 SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
-		TOUCH="${TOUCH}"
+		TOUCH="${TOUCH}" \
+		MKDIR="${MKDIR}"
 
 INSTALL_TARGET=	install-quiet
 
diff --git a/www/mod_php5/scripts/configure.php b/www/mod_php5/scripts/configure.php
index b47d631fe964..f8413f6948a6 100644
--- a/www/mod_php5/scripts/configure.php
+++ b/www/mod_php5/scripts/configure.php
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 if [ "${BATCH}" ]; then
+	${MKDIR} ${WRKDIRPREFIX}${CURDIR}
 	${TOUCH} ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 	exit
 fi
@@ -46,7 +47,7 @@ case $retval in
 		;;
 esac
 
-mkdir -p ${WRKDIRPREFIX}${CURDIR}
+${MKDIR} ${WRKDIRPREFIX}${CURDIR}
 exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 
 while [ "$1" ]; do
-- 
cgit v1.2.3