Complain loudly, if we were not able to install everything.

diff --git a/Makefile.in b/Makefile.in
index cf7264b79a298a8ca062dea718e6e3cc6b0102d3..97f840d772e3ad2964bc9ac63ebd876e9054dcfd 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -47,6 +47,9 @@ install-modules:
        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
 

diff --git a/pear/Makefile.in b/pear/Makefile.in
index 76f93ac96fae271223b444b0b0ab21bdec8848e9..39fbf582c8f1037889f35cce5553624f1e5a5411 100644 (file)
--- a/pear/Makefile.in
+++ b/pear/Makefile.in
@@ -4,20 +4,35 @@ install_targets = install-data-local install-headers install-build
 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

diff --git a/pear/install-pear.txt b/pear/install-pear.txt
new file mode 100644 (file)
index 0000000..3cb9338
--- /dev/null
+++ b/pear/install-pear.txt
@@ -0,0 +1,11 @@
++----------------------------------------------------------------------+
+| The installation process is incomplete. The following resources were |
+| not installed:                                                       |
+|                                                                      |
+|   Self-contained Extension Support                                   |
+|   PEAR: PHP Extension and Add-on Repository                          |
+|                                                                      |
+| To install these components, become the superuser and execute:       |
+|                                                                      |
+|   # make install-su                                                  |
++----------------------------------------------------------------------+