more PECL -> PEAR renaming

diff --git a/pear/Makefile.am b/pear/Makefile.am
index 9d0c129e31c599035f5a6e41be579313bf40bd66..c628f39e027c0c0d0910d0f7e9922073c8258ee0 100644 (file)
--- a/pear/Makefile.am
+++ b/pear/Makefile.am
@@ -1,9 +1,9 @@
 ## Process this file with automake to produce Makefile.in
 
-pecldir=$(prefix)/lib/php
-pecl_DBdir=$(prefix)/lib/php/DB
+peardir=$(prefix)/lib/php
+pear_DBdir=$(prefix)/lib/php/DB
 
 install-data-local:
-       -$(mkinstalldirs) $(pecldir) $(pecl_DBdir) && \
-       $(INSTALL_DATA) $(srcdir)/DB.php $(pecldir) && \
-       $(INSTALL_DATA) $(srcdir)/DB/odbc.php $(pecl_DBdir)
+       -$(mkinstalldirs) $(peardir) $(pear_DBdir) && \
+       $(INSTALL_DATA) $(srcdir)/DB.php $(peardir) && \
+       $(INSTALL_DATA) $(srcdir)/DB/odbc.php $(pear_DBdir)

diff --git a/pear/README b/pear/README
index b8ca9c09c65fb1a61d17ade18b12f49371e20cbc..39c5a04eb6fc1b66dfa659bb0d2d0d385adff4f6 100644 (file)
--- a/pear/README
+++ b/pear/README
@@ -1,12 +1,12 @@
-     PECL (pronounced "pickle") - PHP Extension and Code Library
-     -----------------------------------------------------------
+             PEAR - PHP Extension and Add-on Repository
+             ------------------------------------------
 
-WHAT IS PECL?
+WHAT IS PEAR?
 
-PECL is a code repository for PHP extensions and PHP library code
+PEAR is a code repository for PHP extensions and PHP library code
 similar to TeX's CTAN and Perl's CPAN.
 
-The intention behind PECL is to provide a means for library code
+The intention behind PEAR is to provide a means for library code
 authors to organize their code in a defined way shared by other
 developers, and to give the PHP community a single source for such
 code.
@@ -20,10 +20,12 @@ how functions and classes should be named.
 
 TOOLS
 
-This section will describe the tools provided to PECL users.
+This section will describe the tools provided to PEAR users.
 
 
 CODING RULES AND GUIDELINES
 
-* All PHP code _must_ use <?php ?>.  <? ?> and other formats are not
-  portable.
+* All PHP code must use <?php ?>.  This is the only really portable tag.
+
+* Before adding a new top-level directory ("DB" is one), discuss your
+  intentions on php4beta@lists.php.net.