wsanchez Tue Apr 3 13:59:51 2001 EDT
Modified files:
/php4 Makefile.in configure.in
/php4/build build.mk
/php4/ext/java config.m4
/php4/pear Makefile.in
/php4/sapi/aolserver config.m4
/php4/sapi/apache config.m4
/php4/sapi/cgi config.m4
/php4/sapi/isapi config.m4
/php4/sapi/nsapi config.m4
/php4/sapi/phttpd config.m4
/php4/sapi/pi3web config.m4
Log:
Add INSTALL_ROOT variable to specify install location.
Index: php4/Makefile.in
diff -u php4/Makefile.in:1.96 php4/Makefile.in:1.97
--- php4/Makefile.in:1.96 Mon Mar 19 03:03:29 2001
+++ php4/Makefile.in Tue Apr 3 13:59:44 2001
@@ -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: php4/configure.in
diff -u php4/configure.in:1.227 php4/configure.in:1.228
--- php4/configure.in:1.227 Wed Mar 28 14:30:21 2001
+++ php4/configure.in Tue Apr 3 13:59:44 2001
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.227 2001/03/28 22:30:21 sniper Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.228 2001/04/03 20:59:44 wsanchez Exp $ -*- sh -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -713,11 +713,13 @@
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
Index: php4/build/build.mk
diff -u php4/build/build.mk:1.5 php4/build/build.mk:1.6
--- php4/build/build.mk:1.5 Sat Aug 19 22:36:07 2000
+++ php4/build/build.mk Tue Apr 3 13:59:45 2001
@@ -14,7 +14,7 @@
# | Authors: Sascha Schumann <[EMAIL PROTECTED]> |
# +----------------------------------------------------------------------+
#
-# $Id: build.mk,v 1.5 2000/08/20 05:36:07 sas Exp $
+# $Id: build.mk,v 1.6 2001/04/03 20:59:45 wsanchez Exp $
#
#
# Makefile to generate build tools
@@ -27,17 +27,17 @@
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 @@
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
Index: php4/ext/java/config.m4
diff -u php4/ext/java/config.m4:1.23 php4/ext/java/config.m4:1.24
--- php4/ext/java/config.m4:1.23 Tue Mar 27 12:34:30 2001
+++ php4/ext/java/config.m4 Tue Apr 3 13:59:45 2001
@@ -1,4 +1,4 @@
-# $Id: config.m4,v 1.23 2001/03/27 20:34:30 sniper Exp $
+# $Id: config.m4,v 1.24 2001/04/03 20:59:45 wsanchez Exp $
# config.m4 for extension java
AC_MSG_CHECKING(for Java support)
@@ -99,8 +99,8 @@
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)
Index: php4/pear/Makefile.in
diff -u php4/pear/Makefile.in:1.75 php4/pear/Makefile.in:1.76
--- php4/pear/Makefile.in:1.75 Sat Mar 24 13:48:41 2001
+++ php4/pear/Makefile.in Tue Apr 3 13:59:45 2001
@@ -100,16 +100,16 @@
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 @@
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 @@
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
Index: php4/sapi/aolserver/config.m4
diff -u php4/sapi/aolserver/config.m4:1.11 php4/sapi/aolserver/config.m4:1.12
--- php4/sapi/aolserver/config.m4:1.11 Tue Mar 27 12:34:44 2001
+++ php4/sapi/aolserver/config.m4 Tue Apr 3 13:59:46 2001
@@ -1,4 +1,4 @@
-dnl ## $Id: config.m4,v 1.11 2001/03/27 20:34:44 sniper Exp $ -*- sh -*-
+dnl ## $Id: config.m4,v 1.12 2001/04/03 20:59:46 wsanchez Exp $ -*- sh -*-
AC_MSG_CHECKING(for AOLserver support)
AC_ARG_WITH(aolserver,
@@ -24,7 +24,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: php4/sapi/apache/config.m4
diff -u php4/sapi/apache/config.m4:1.36 php4/sapi/apache/config.m4:1.37
--- php4/sapi/apache/config.m4:1.36 Tue Mar 27 12:34:45 2001
+++ php4/sapi/apache/config.m4 Tue Apr 3 13:59:46 2001
@@ -49,7 +49,7 @@
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
Index: php4/sapi/cgi/config.m4
diff -u php4/sapi/cgi/config.m4:1.6 php4/sapi/cgi/config.m4:1.7
--- php4/sapi/cgi/config.m4:1.6 Wed Dec 20 09:21:36 2000
+++ php4/sapi/cgi/config.m4 Tue Apr 3 13:59:46 2001
@@ -30,7 +30,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: php4/sapi/isapi/config.m4
diff -u php4/sapi/isapi/config.m4:1.10 php4/sapi/isapi/config.m4:1.11
--- php4/sapi/isapi/config.m4:1.10 Tue Mar 27 12:34:46 2001
+++ php4/sapi/isapi/config.m4 Tue Apr 3 13:59:47 2001
@@ -1,4 +1,4 @@
-dnl ## $Id: config.m4,v 1.10 2001/03/27 20:34:46 sniper Exp $ -*- sh -*-
+dnl ## $Id: config.m4,v 1.11 2001/04/03 20:59:47 wsanchez Exp $ -*- sh -*-
RESULT=no
AC_MSG_CHECKING(for Zeus ISAPI support)
@@ -16,7 +16,7 @@
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)
Index: php4/sapi/nsapi/config.m4
diff -u php4/sapi/nsapi/config.m4:1.8 php4/sapi/nsapi/config.m4:1.9
--- php4/sapi/nsapi/config.m4:1.8 Tue Mar 27 12:34:46 2001
+++ php4/sapi/nsapi/config.m4 Tue Apr 3 13:59:49 2001
@@ -1,4 +1,4 @@
-dnl ## $Id: config.m4,v 1.8 2001/03/27 20:34:46 sniper Exp $ -*- sh -*-
+dnl ## $Id: config.m4,v 1.9 2001/04/03 20:59:49 wsanchez Exp $ -*- sh -*-
AC_MSG_CHECKING(for NSAPI support)
AC_ARG_WITH(nsapi,
@@ -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: php4/sapi/phttpd/config.m4
diff -u php4/sapi/phttpd/config.m4:1.4 php4/sapi/phttpd/config.m4:1.5
--- php4/sapi/phttpd/config.m4:1.4 Tue Mar 27 12:34:46 2001
+++ php4/sapi/phttpd/config.m4 Tue Apr 3 13:59:49 2001
@@ -1,4 +1,4 @@
-dnl ## $Id: config.m4,v 1.4 2001/03/27 20:34:46 sniper Exp $ -*- sh -*-
+dnl ## $Id: config.m4,v 1.5 2001/04/03 20:59:49 wsanchez Exp $ -*- sh -*-
RESULT=no
AC_MSG_CHECKING(for PHTTPD support)
@@ -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: php4/sapi/pi3web/config.m4
diff -u php4/sapi/pi3web/config.m4:1.3 php4/sapi/pi3web/config.m4:1.4
--- php4/sapi/pi3web/config.m4:1.3 Tue Mar 27 12:34:50 2001
+++ php4/sapi/pi3web/config.m4 Tue Apr 3 13:59:50 2001
@@ -16,7 +16,7 @@
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:
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]
