Re: [PATCH] Add INSTALL_ROOT destination prefix

> Nice concept, but the patch is malformed and would not apply > to the current CVS anyway (changes in pear/Makefile.in). > > Please use a current snapshot as the base: > http://snaps.php.net OK, below is the same patch against php4-200008231745. In case my mailer munges it again, you can also get it from: ftp://isp.mit.edu/users/tritan/MacOSX/diffs.php4 I can certainly understand if it goes in after 4.0.2, if you are in risk-averse mode at this point. Thanks for the help. -Fred Index: Services/apache_mod_php-dev/php/Makefile.in diff -u Services/apache_mod_php-dev/php/Makefile.in:1.1.1.1 Services/apache_mod_php-dev/php/Makefile.in:1.2 --- Services/apache_mod_php-dev/php/Makefile.in:1.1.1.1 Wed Aug 9 19:08:25 2000 +++ Services/apache_mod_php-dev/php/Makefile.in Fri Aug 11 13:59:21 2000 @@ -32,7 +32,7 @@ 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-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) Index: Services/apache_mod_php-dev/php/ext/java/config.m4 diff -u Services/apache_mod_php-dev/php/ext/java/config.m4:1.1.1.2 Services/apache_mod_php-dev/php/ext/java/config.m4:1.3 --- Services/apache_mod_php-dev/php/ext/java/config.m4:1.1.1.2 Wed Aug 23 18:55:10 2000 +++ Services/apache_mod_php-dev/php/ext/java/config.m4 Wed Aug 23 20:16:27 2000 @@ -89,7 +89,7 @@ AC_ADD_LIBRARY($JAVA_LIB) fi - INSTALL_IT="$INSTALL_IT; \$(INSTALL) -m 0755 \$(srcdir)/ext/java/php_java.jar \$(libdir)" + INSTALL_IT="$INSTALL_IT; \$(INSTALL) -m 0755 \$(srcdir)/ext/java/php_java.jar \$(INSTALL_ROOT)\$(libdir)" fi AC_MSG_RESULT(yes) Index: Services/apache_mod_php-dev/php/pear/Makefile.in diff -u Services/apache_mod_php-dev/php/pear/Makefile.in:1.1.1.2 Services/apache_mod_php-dev/php/pear/Makefile.in:1.3 --- Services/apache_mod_php-dev/php/pear/Makefile.in:1.1.1.2 Wed Aug 23 18:55:59 2000 +++ Services/apache_mod_php-dev/php/pear/Makefile.in Wed Aug 23 20:16:28 2000 @@ -31,13 +31,13 @@ PEAR/Installer.php install-data-local: PEAR.php - @if $(mkinstalldirs) $(peardir); then \ + @if $(mkinstalldirs) $(INSTALL_ROOT)$(peardir); then \ for i in $(PEAR_SUBDIRS); do \ - $(mkinstalldirs) $(peardir)/$$i; \ + $(mkinstalldirs) $(INSTALL_ROOT)$(peardir)/$$i; \ done; \ for i in $(PEAR_FILES); do \ dir=echo $$i|sed 's%[^/][^/]*$$%%'; \ - $(INSTALL_DATA) $(srcdir)/$$i $(peardir)/$$dir; \ + $(INSTALL_DATA) $(srcdir)/$$i $(INSTALL_ROOT)$(peardir)/$$dir; \ done; \ else \ cat $(srcdir)/install-pear.txt; \ @@ -64,13 +64,13 @@ bin_PROGRAMS = phpize php-config pear install-build: - $(mkinstalldirs) $(builddir) $(bindir) && \ - (cd $(top_srcdir) && cp $(BUILD_FILES) $(builddir)) + $(mkinstalldirs) $(INSTALL_ROOT)$(builddir) $(INSTALL_ROOT)$(bindir) && \ + (cd $(top_srcdir) && cp $(BUILD_FILES) $(INSTALL_ROOT)$(builddir)) install-programs: - $(INSTALL) -m 755 $(srcdir)/phpextdist $(bindir)/phpextdist + $(INSTALL) -m 755 $(srcdir)/phpextdist $(INSTALL_ROOT)$(bindir)/phpextdist for prog in $(bin_PROGRAMS); do \ - $(INSTALL) -m 755 $$prog $(bindir)/$$prog; \ + $(INSTALL) -m 755 $$prog $(INSTALL_ROOT)$(bindir)/$$prog; \ done HEADER_DIRS = \ @@ -86,13 +86,13 @@ 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 test: run-tests Makefile Index: Services/apache_mod_php-dev/php/sapi/aolserver/config.m4 diff -u Services/apache_mod_php-dev/php/sapi/aolserver/config.m4:1.1.1.1 Services/apache_mod_php-dev/php/sapi/aolserver/config.m4:1.2 --- Services/apache_mod_php-dev/php/sapi/aolserver/config.m4:1.1.1.1 Wed Aug 9 19:08:39 2000 +++ Services/apache_mod_php-dev/php/sapi/aolserver/config.m4 Fri Aug 11 13:59:21 2000 @@ -30,7 +30,7 @@ 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: Index: Services/apache_mod_php-dev/php/sapi/apache/config.m4 diff -u Services/apache_mod_php-dev/php/sapi/apache/config.m4:1.1.1.1 Services/apache_mod_php-dev/php/sapi/apache/config.m4:1.2 --- Services/apache_mod_php-dev/php/sapi/apache/config.m4:1.1.1.1 Wed Aug 9 19:08:39 2000 +++ Services/apache_mod_php-dev/php/sapi/apache/config.m4 Fri Aug 11 13:59:22 2000 @@ -46,7 +46,7 @@ CPPFLAGS="$CPPFLAGS -DEAPI=1" fi 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 Index: Services/apache_mod_php-dev/php/sapi/cgi/config.m4 diff -u Services/apache_mod_php-dev/php/sapi/cgi/config.m4:1.1.1.1 Services/apache_mod_php-dev/php/sapi/cgi/config.m4:1.2 --- Services/apache_mod_php-dev/php/sapi/cgi/config.m4:1.1.1.1 Wed Aug 9 19:08:39 2000 +++ Services/apache_mod_php-dev/php/sapi/cgi/config.m4 Fri Aug 11 13:59:22 2000 @@ -32,7 +32,7 @@ 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) Index: Services/apache_mod_php-dev/php/sapi/isapi/config.m4 diff -u Services/apache_mod_php-dev/php/sapi/isapi/config.m4:1.1.1.1 Services/apache_mod_php-dev/php/sapi/isapi/config.m4:1.2 --- Services/apache_mod_php-dev/php/sapi/isapi/config.m4:1.1.1.1 Wed Aug 9 19:08:39 2000 +++ Services/apache_mod_php-dev/php/sapi/isapi/config.m4 Fri Aug 11 13:59:22 2000 @@ -16,7 +16,7 @@ AC_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) Index: Services/apache_mod_php-dev/php/sapi/nsapi/config.m4 diff -u Services/apache_mod_php-dev/php/sapi/nsapi/config.m4:1.1.1.1 Services/apache_mod_php-dev/php/sapi/nsapi/config.m4:1.2 --- Services/apache_mod_php-dev/php/sapi/nsapi/config.m4:1.1.1.1 Wed Aug 9 19:08:39 2000 +++ Services/apache_mod_php-dev/php/sapi/nsapi/config.m4 Fri Aug 11 13:59:22 2000 @@ -28,7 +28,7 @@ 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 Index: Services/apache_mod_php-dev/php/sapi/phttpd/config.m4 diff -u Services/apache_mod_php-dev/php/sapi/phttpd/config.m4:1.1.1.1 Services/apache_mod_php-dev/php/sapi/phttpd/config.m4:1.2 --- Services/apache_mod_php-dev/php/sapi/phttpd/config.m4:1.1.1.1 Wed Aug 9 19:08:40 2000 +++ Services/apache_mod_php-dev/php/sapi/phttpd/config.m4 Fri Aug 11 13:59:22 2000 @@ -14,7 +14,7 @@ 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) Index: Services/apache_mod_php-dev/php/sapi/pi3web/config.m4 diff -u Services/apache_mod_php-dev/php/sapi/pi3web/config.m4:1.1.1.1 Services/apache_mod_php-dev/php/sapi/pi3web/config.m4:1.2 --- Services/apache_mod_php-dev/php/sapi/pi3web/config.m4:1.1.1.1 Wed Aug 9 19:08:40 2000 +++ Services/apache_mod_php-dev/php/sapi/pi3web/config.m4 Fri Aug 11 13:59:22 2000 @@ -16,7 +16,7 @@ AC_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: Wilfredo Sánchez, wsanchez@apple.com Open Source Engineering Lead Apple Computer, Inc., Core Operating System Group 1 Infinite Loop, Cupertino, CA 94086, 408.974-5174