summaryrefslogtreecommitdiff
path: root/sapi
diff options
context:
space:
mode:
Diffstat (limited to 'sapi')
-rw-r--r--sapi/aolserver/config.m42
-rw-r--r--sapi/apache/config.m42
-rw-r--r--sapi/cgi/config.m42
-rw-r--r--sapi/isapi/config.m42
-rw-r--r--sapi/nsapi/config.m42
-rw-r--r--sapi/phttpd/config.m42
-rw-r--r--sapi/pi3web/config.m42
7 files changed, 7 insertions, 7 deletions
diff --git a/sapi/aolserver/config.m4 b/sapi/aolserver/config.m4
index a353b3c4dc..df97853d29 100644
--- a/sapi/aolserver/config.m4
+++ b/sapi/aolserver/config.m4
@@ -24,7 +24,7 @@ if test "$PHP_AOLSERVER" != "no"; then
AC_DEFINE(HAVE_AOLSERVER,1,[Whether you have AOLserver])
PHP_SAPI=aolserver
PHP_BUILD_SHARED
- INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED $PHP_AOLSERVER/bin/"
+ INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)$PHP_AOLSERVER/bin/"
fi
dnl ## Local Variables:
diff --git a/sapi/apache/config.m4 b/sapi/apache/config.m4
index 8030f2c8ee..1abef24515 100644
--- a/sapi/apache/config.m4
+++ b/sapi/apache/config.m4
@@ -49,7 +49,7 @@ AC_ARG_WITH(apxs,
done
PHP_ADD_INCLUDE($APXS_INCLUDEDIR)
PHP_SAPI=apache
- APACHE_INSTALL="$APXS -i -a -n php4 $SAPI_SHARED"
+ APACHE_INSTALL="\$(mkinstalldirs) \"\$(INSTALL_ROOT)`$APXS -q LIBEXECDIR`\" && $APXS -S LIBEXECDIR=\"\$(INSTALL_ROOT)`$APXS -q LIBEXECDIR`\" -i -a -n php4 $SAPI_SHARED"
PHP_BUILD_SHARED
if test -z "`$APXS -q LD_SHLIB`" || test "`$APXS -q LIBEXECDIR`" = "modules"; then
PHP_APXS_BROKEN=yes
diff --git a/sapi/cgi/config.m4 b/sapi/cgi/config.m4
index ad427997d2..9c1ea3acc5 100644
--- a/sapi/cgi/config.m4
+++ b/sapi/cgi/config.m4
@@ -30,7 +30,7 @@ if test "$PHP_SAPI" = "cgi"; then
fi
if test "$PHP_SAPI" = "cgi" ; then
- INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_PROGRAM \$(bindir)/$SAPI_CGI"
+ INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_PROGRAM \$(INSTALL_ROOT)\$(bindir)/$SAPI_CGI"
fi
AC_MSG_CHECKING(for fhttpd module support)
diff --git a/sapi/isapi/config.m4 b/sapi/isapi/config.m4
index f40bd2c651..ceba1b9a1c 100644
--- a/sapi/isapi/config.m4
+++ b/sapi/isapi/config.m4
@@ -16,7 +16,7 @@ AC_ARG_WITH(isapi,
PHP_ADD_INCLUDE($ZEUSPATH/web/include)
PHP_SAPI=isapi
PHP_BUILD_SHARED
- INSTALL_IT="\$(SHELL) \$(srcdir)/install-sh -m 0755 $SAPI_SHARED $ZEUSPATH/web/bin/"
+ INSTALL_IT="\$(SHELL) \$(srcdir)/install-sh -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)$ZEUSPATH/web/bin/"
RESULT=yes
])
AC_MSG_RESULT($RESULT)
diff --git a/sapi/nsapi/config.m4 b/sapi/nsapi/config.m4
index a550914203..b03ed8b524 100644
--- a/sapi/nsapi/config.m4
+++ b/sapi/nsapi/config.m4
@@ -28,7 +28,7 @@ if test "$PHP_NSAPI" != "no"; then
AC_DEFINE(HAVE_NSAPI,1,[Whether you have a Netscape Server])
PHP_SAPI=nsapi
PHP_BUILD_SHARED
- INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED $PHP_NSAPI/bin/"
+ INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)$PHP_NSAPI/bin/"
fi
diff --git a/sapi/phttpd/config.m4 b/sapi/phttpd/config.m4
index 516ec6b433..038fbc8e8a 100644
--- a/sapi/phttpd/config.m4
+++ b/sapi/phttpd/config.m4
@@ -14,7 +14,7 @@ AC_ARG_WITH(phttpd,
AC_DEFINE(HAVE_PHTTPD,1,[Whether you have phttpd])
PHP_SAPI=phttpd
PHP_BUILD_SHARED
- INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED $PHTTPD_DIR/modules/"
+ INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)$PHTTPD_DIR/modules/"
RESULT=yes
])
AC_MSG_RESULT($RESULT)
diff --git a/sapi/pi3web/config.m4 b/sapi/pi3web/config.m4
index 8e04e5952e..eb729f75d7 100644
--- a/sapi/pi3web/config.m4
+++ b/sapi/pi3web/config.m4
@@ -16,7 +16,7 @@ if test "$PHP_PI3WEB" != "no"; then
PHP_ADD_INCLUDE($PI3PATH/PHP4)
PHP_SAPI=pi3web
PHP_BUILD_SHARED
- INSTALL_IT="\$(SHELL) \$(srcdir)/install-sh -m 0755 $SAPI_SHARED $PI3PATH/bin/"
+ INSTALL_IT="\$(SHELL) \$(srcdir)/install-sh -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)$PI3PATH/bin/"
fi
dnl ## Local Variables: