From 6000c7b46cb11dfe76d55f31e0dbf8a3984bcb14 Mon Sep 17 00:00:00 2001
From: foobar <sniper@php.net>
Date: Sun, 23 Feb 2003 07:32:03 +0000
Subject: - Fixed bug #22376 (wrong httpd.conf modified when using
 INSTALL_ROOT)

---
 sapi/apache2filter/config.m4 | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'sapi/apache2filter')

diff --git a/sapi/apache2filter/config.m4 b/sapi/apache2filter/config.m4
index 3520d524a9..770c3eabd7 100644
--- a/sapi/apache2filter/config.m4
+++ b/sapi/apache2filter/config.m4
@@ -52,13 +52,18 @@ AC_ARG_WITH(apxs2,
 
   APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
   if test -z `$APXS -q SYSCONFDIR`; then
-    optarg=
+    INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
+                 $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
+                       -i -n php4"
   else
-    optarg=-a
+    APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR`
+    INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
+                \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
+                 $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
+                       -S SYSCONFDIR='$APXS_SYSCONFDIR' \
+                       -i -a -n php4"
   fi
 
-  INSTALL_IT='$(mkinstalldirs) '"$APXS_LIBEXECDIR && $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' -i ${optarg} -n php4"
-
   case $host_alias in
   *aix*)
     EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-brtl -Wl,-bI:$APXS_LIBEXECDIR/httpd.exp"
-- 
cgit v1.2.1