cvs: /php4/pear install-pear.txt /php4 Makefile.in /php4/pear Makefile.in
| From: | Sascha Schumann | Date: | Tue, 02 May 2000 22:28:12 +0000 |
| Subject: | cvs: /php4/pear install-pear.txt /php4 Makefile.in /php4/pear Makefile.in | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-14394@lists.php.net to get a copy of this message | ||
sas Tue May 2 15:28:12 2000 EDT
Added files:
/php4/pear install-pear.txt
Modified files:
/php4 Makefile.in
/php4/pear Makefile.in
Log:
Complain loudly, if we were not able to install everything.
Index: php4/Makefile.in
diff -u php4/Makefile.in:1.85 php4/Makefile.in:1.86
--- php4/Makefile.in:1.85 Tue May 2 13:08:54 2000
+++ php4/Makefile.in Tue May 2 15:28:12 2000
@@ -47,6 +47,9 @@
rm -f modules/*.la && \
cp modules/* $(moduledir) || true
+install-su: install-modules
+ (cd pear && $(MAKE) install)
+
configuration-parser.h configuration-parser.c: $(srcdir)/configuration-parser.y
$(YACC) -p cfg -v -d $< -o configuration-parser.c
Index: php4/pear/Makefile.in
diff -u php4/pear/Makefile.in:1.20 php4/pear/Makefile.in:1.21
--- php4/pear/Makefile.in:1.20 Tue May 2 15:10:41 2000
+++ php4/pear/Makefile.in Tue May 2 15:28:12 2000
@@ -4,20 +4,35 @@
include $(top_srcdir)/build/rules.mk
peardir=$(prefix)/lib/php
-pear_DBdir=$(prefix)/lib/php/DB
-pear_Filedir=$(prefix)/lib/php/File
+PEAR_SUBDIRS = \
+ DB \
+ File
+
+PEAR_FILES = \
+ DB.php \
+ DB/common.php \
+ DB/odbc.php \
+ DB/mysql.php \
+ DB/mssql.php \
+ DB/pgsql.php \
+ DB/storage.php \
+ HTTP.php \
+ File/Find.php
+
install-data-local:
- -@$(mkinstalldirs) $(peardir) $(pear_DBdir) $(pear_Filedir) && \
- $(INSTALL_DATA) $(srcdir)/DB.php $(peardir) && \
- $(INSTALL_DATA) $(srcdir)/DB/common.php $(pear_DBdir) && \
- $(INSTALL_DATA) $(srcdir)/DB/odbc.php $(pear_DBdir) && \
- $(INSTALL_DATA) $(srcdir)/DB/mysql.php $(pear_DBdir) && \
- $(INSTALL_DATA) $(srcdir)/DB/mssql.php $(pear_DBdir) && \
- $(INSTALL_DATA) $(srcdir)/DB/pgsql.php $(pear_DBdir) && \
- $(INSTALL_DATA) $(srcdir)/DB/storage.php $(pear_DBdir) && \
- $(INSTALL_DATA) $(srcdir)/HTTP.php $(peardir) && \
- $(INSTALL_DATA) $(srcdir)/File/Find.php $(pear_Filedir)
+ @if $(mkinstalldirs) $(peardir); then \
+ for i in $(PEAR_SUBDIRS); do \
+ $(mkinstalldirs) $(peardir)/$$i; \
+ done; \
+ for i in $(PEAR_FILES); do \
+ dir=
echo $$i|sed 's%[^/][^/]*$%%'; \
+ $(INSTALL_DATA) $(srcdir)/$$i $(peardir)/$$dir; \
+ done; \
+ else \
+ cat $(srcdir)/install-pear.txt; \
+ exit 5; \
+ fi
phpincludedir = $(includedir)/php
builddir = $(prefix)/lib/php/build