Add INSTALL_ROOT variable to specify install location.

diff --git a/Makefile.in b/Makefile.in
index 6968ba80fcb81927e697c9c7d794fccbde2fb4a8..10096465082ad60221057d1d09005be0bd2bffff 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -32,7 +32,7 @@ include $(top_srcdir)/build/program.mk
 
 install-sapi:
        @$(LIBTOOL) --silent --mode=install cp libphp4.la $(phptempdir)/libphp4.la >/dev/null 2>&1
-       -@$(mkinstalldirs) $(bindir)
+       -@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
        -@if test ! -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME); then \
                for i in 0.0.0 0.0 0; do \
                        if test -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME).$$i; then \
@@ -45,10 +45,10 @@ install-sapi:
 
 install-modules:
        @test -d modules && \
-       $(mkinstalldirs) $(moduledir) && \
+       $(mkinstalldirs) $(INSTALL_ROOT)$(moduledir) && \
        echo "installing shared modules into $(moduledir)" && \
        rm -f modules/*.la && \
-       cp modules/* $(moduledir) >/dev/null 2>&1 || true
+       cp modules/* $(INSTALL_ROOT)$(moduledir) >/dev/null 2>&1 || true
 
 install-su: install-modules
        (cd pear && $(MAKE) install)

diff --git a/build/build.mk b/build/build.mk
index b91918bb910b0cec58e43d3ae04ff4517a4547a2..6af4ea46286753d9ccbeed30b485a4ef19d75130 100644 (file)
--- a/build/build.mk
+++ b/build/build.mk
@@ -27,17 +27,17 @@ STAMP = buildmk.stamp
 ALWAYS = generated_lists
 
 all: $(STAMP) $(ALWAYS)
-       @$(MAKE) AMFLAGS=$(AMFLAGS) -s -f build/build2.mk
+       $(MAKE) AMFLAGS=$(AMFLAGS) -f build/build2.mk
 
 generated_lists:
-       @echo makefile_am_files = Zend/Makefile.am \
+       echo makefile_am_files = Zend/Makefile.am \
                TSRM/Makefile.am > $@
-       @echo config_h_files = Zend/acconfig.h TSRM/acconfig.h >> $@
-       @echo config_m4_files = Zend/Zend.m4 TSRM/tsrm.m4 \
+       echo config_h_files = Zend/acconfig.h TSRM/acconfig.h >> $@
+       echo config_m4_files = Zend/Zend.m4 TSRM/tsrm.m4 \
                Zend/acinclude.m4 ext/*/config.m4 sapi/*/config.m4 >> $@
 
 $(STAMP): build/buildcheck.sh
-       @build/buildcheck.sh && touch $(STAMP)
+       build/buildcheck.sh && touch $(STAMP)
 
 snapshot:
        distname='$(DISTNAME)'; \
@@ -63,9 +63,9 @@ snapshot:
        bzip2 -t $$distname.tar.bz2
 
 cvsclean:
-       @for i in `find . -name .cvsignore`; do \
+       for i in `find . -name .cvsignore`; do \
                (cd `dirname $$i` 2>/dev/null && rm -rf `cat .cvsignore` *.o *.a || true); \
        done
-       @rm -f $(SUBDIRS) 2>/dev/null || true
+       rm -f $(SUBDIRS) 2>/dev/null || true
 
 .PHONY: $(ALWAYS) snapshot cvsclean

diff --git a/configure.in b/configure.in
index 9cb80257f07db6b2c0e67b648ede316aaf19da8c..08d485b724799bd4cda9e60b88025eb2ded85ad6 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -713,11 +713,13 @@ fi
 
 ZEND_MODULE_API_NO=`egrep '#define ZEND_MODULE_API_NO ' $srcdir/Zend/zend_modules.h|sed 's/#define ZEND_MODULE_API_NO //'`
 
-EXTENSION_DIR="$prefix/lib/php/extensions/$PART1-$PART2-$ZEND_MODULE_API_NO"
+if test -z "$PEAR_INSTALLDIR"; then
+  PEAR_INSTALLDIR="$prefix/lib/php"
+fi
 
-PEAR_INSTALLDIR="$prefix/lib/php"
+EXTENSION_DIR="\${PEAR_INSTALLDIR}/extensions/$PART1-$PART2-$ZEND_MODULE_API_NO"
 
-INCLUDE_PATH=".:$PEAR_INSTALLDIR"
+INCLUDE_PATH=".:\${PEAR_INSTALLDIR}"
 
 PHP_BUILD_RPATH
 

diff --git a/ext/java/config.m4 b/ext/java/config.m4
index 66996ab371fc278040e4c8a3668b6915b82a3b10..ebd6f7707e5ef61ea9ec81340dc001cc3b60dcbd 100644 (file)
--- a/ext/java/config.m4
+++ b/ext/java/config.m4
@@ -99,8 +99,8 @@ AC_ARG_WITH(java,
         PHP_ADD_LIBRARY($JAVA_LIB)
       fi
 
-      INSTALL_IT="$INSTALL_IT; \$(srcdir)/build/shtool mkdir -p -f -m 0755 \$(libdir)"
-      INSTALL_IT="$INSTALL_IT; \$(INSTALL) -m 0755 \$(srcdir)/ext/java/php_java.jar \$(libdir)"
+      INSTALL_IT="$INSTALL_IT; \$(srcdir)/build/shtool mkdir -p -f -m 0755 \$(INSTALL_ROOT)\$(libdir)"
+      INSTALL_IT="$INSTALL_IT; \$(INSTALL) -m 0755 \$(srcdir)/ext/java/php_java.jar \$(INSTALL_ROOT)\$(libdir)"
     fi
 
     AC_MSG_RESULT(yes)

diff --git a/ext/rpc/java/config.m4 b/ext/rpc/java/config.m4
index 66996ab371fc278040e4c8a3668b6915b82a3b10..ebd6f7707e5ef61ea9ec81340dc001cc3b60dcbd 100644 (file)
--- a/ext/rpc/java/config.m4
+++ b/ext/rpc/java/config.m4
@@ -99,8 +99,8 @@ AC_ARG_WITH(java,
         PHP_ADD_LIBRARY($JAVA_LIB)
       fi
 
-      INSTALL_IT="$INSTALL_IT; \$(srcdir)/build/shtool mkdir -p -f -m 0755 \$(libdir)"
-      INSTALL_IT="$INSTALL_IT; \$(INSTALL) -m 0755 \$(srcdir)/ext/java/php_java.jar \$(libdir)"
+      INSTALL_IT="$INSTALL_IT; \$(srcdir)/build/shtool mkdir -p -f -m 0755 \$(INSTALL_ROOT)\$(libdir)"
+      INSTALL_IT="$INSTALL_IT; \$(INSTALL) -m 0755 \$(srcdir)/ext/java/php_java.jar \$(INSTALL_ROOT)\$(libdir)"
     fi
 
     AC_MSG_RESULT(yes)

diff --git a/pear/Makefile.in b/pear/Makefile.in
index 938e9dd80c3d2f8db3cc720a02a9e0c228e05cbf..7eb0a5aa3526d1e08c721da22cc06b8926e6054c 100644 (file)
--- a/pear/Makefile.in
+++ b/pear/Makefile.in
@@ -100,16 +100,16 @@ PEAR_FILES = \
        XML/RPC.php
 
 install-data-local: PEAR.php
-       @if $(mkinstalldirs) $(peardir); then \
+       @if $(mkinstalldirs) $(INSTALL_ROOT)$(peardir); then \
                for i in $(PEAR_SUBDIRS); do \
-                       (set -x;$(mkinstalldirs) $(peardir)/$$i); \
+                       (set -x;$(mkinstalldirs) $(INSTALL_ROOT)$(peardir)/$$i); \
                done; \
                for i in $(PEAR_FILES); do \
                        dir=`echo $$i|sed 's%[^/][^/]*$$%%'`; \
-                       (set -x;$(INSTALL_DATA) $(srcdir)/$$i $(peardir)/$$dir); \
+                       (set -x;$(INSTALL_DATA) $(srcdir)/$$i $(INSTALL_ROOT)$(peardir)/$$dir); \
                done; \
                for i in PEAR.php; do \
-                       (set -x;$(INSTALL_DATA) $$i $(peardir)); \
+                       (set -x;$(INSTALL_DATA) $$i $(INSTALL_ROOT)$(peardir)); \
                done; \
        else \
                cat $(srcdir)/install-pear.txt; \
@@ -137,15 +137,15 @@ BUILD_FILES = \
 bin_SCRIPTS = phpize php-config pear
 
 install-build:
-       $(mkinstalldirs) $(phpbuilddir) $(bindir) && \
-       (cd $(top_srcdir) && cp $(BUILD_FILES) $(phpbuilddir))
+       $(mkinstalldirs) $(INSTALL_ROOT)$(phpbuilddir) $(INSTALL_ROOT)$(bindir) && \
+       (cd $(top_srcdir) && cp $(BUILD_FILES) $(INSTALL_ROOT)$(phpbuilddir))
 
 install-programs:
        for prog in $(bin_SCRIPTS); do \
-               $(INSTALL) -m 755 scripts/$$prog $(bindir)/$$prog; \
+               $(INSTALL) -m 755 scripts/$$prog $(INSTALL_ROOT)$(bindir)/$$prog; \
        done; \
        for prog in phpextdist; do \
-               $(INSTALL) -m 755 $(srcdir)/scripts/$$prog $(bindir)/$$prog; \
+               $(INSTALL) -m 755 $(srcdir)/scripts/$$prog $(INSTALL_ROOT)$(bindir)/$$prog; \
        done
 
 HEADER_DIRS = \
@@ -161,13 +161,13 @@ HEADER_DIRS = \
 
 install-headers:
        -@for i in $(HEADER_DIRS); do \
-               paths="$$paths $(phpincludedir)/$$i"; \
+               paths="$$paths $(INSTALL_ROOT)$(phpincludedir)/$$i"; \
        done; \
        $(mkinstalldirs) $$paths && \
        echo "creating header file hierarchy" && \
        for i in $(HEADER_DIRS); do \
-               (cd $(top_srcdir)/$$i && cp -p *.h $(phpincludedir)/$$i; \
-               cd $(top_builddir)/$$i && cp -p *.h $(phpincludedir)/$$i) 2>/dev/null || true; \
+               (cd $(top_srcdir)/$$i && cp -p *.h $(INSTALL_ROOT)$(phpincludedir)/$$i; \
+               cd $(top_builddir)/$$i && cp -p *.h $(INSTALL_ROOT)$(phpincludedir)/$$i) 2>/dev/null || true; \
        done
 
 Makefile: Makefile.in $(top_builddir)/config.status

diff --git a/sapi/aolserver/config.m4 b/sapi/aolserver/config.m4
index a353b3c4dc4e5c7bf7c1f77148a3398c5174b98c..df97853d2972be58f587f6d05f44db29730d4e09 100644 (file)
--- 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 8030f2c8eebacdc12c3c2e5e6ca7f7c88d1b1b29..1abef245151c44e8632fc59e0c1aff0cc6f54baa 100644 (file)
--- 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 ad427997d299671c2d3ebfe59c781495bb167573..9c1ea3acc5ce18e5ed4e686ad9ffb73635511e70 100644 (file)
--- 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 f40bd2c65177851372be9cbbc6e8175b5983e1da..ceba1b9a1c80b065c53b5ba9ca3f6c058c481015 100644 (file)
--- 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 a550914203ae861ee8f4c730ff23d787ee7199e5..b03ed8b52480d1a1841cb6ccb0a709f9adb84c4c 100644 (file)
--- 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 516ec6b433bf6ddd08e8a942ccdf2a7909e8ed5c..038fbc8e8a505354b87d4f5ed6b7313679557b67 100644 (file)
--- 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 8e04e5952e0b2f7cdcd371dd04dd3a578d3a08f4..eb729f75d741bc0cf23ff78e8a01a3f8fce08c41 100644 (file)
--- 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: