* keep installing the bundled files in 4.2 too

diff --git a/pear/Makefile.in b/pear/Makefile.in
index 3b60935a7c09e1815a3bc45c2d48b88954c2fd83..bca9359807d6e6d86e6efdf3c2b8c1dc5a9f84d9 100644 (file)
--- a/pear/Makefile.in
+++ b/pear/Makefile.in
@@ -15,19 +15,17 @@ PEAR_SUBDIRS = \
        PEAR \
        PEAR/Command \
        PEAR/Frontend \
-       XML 
-
-# These are moving to /pear (in cvs):
-#      Crypt \
-#      File \
-#      Date \
-#      DB \
-#      HTML \
-#      HTTP \
-#      Image \
-#      Mail \
-#      Net \
-#      Schedule \
+       XML \
+       Crypt \
+       File \
+       Date \
+       DB \
+       HTML \
+       HTTP \
+       Image \
+       Mail \
+       Net \
+       Schedule
 
 PEAR_FILES = \
        Archive/Tar.php \
@@ -52,48 +50,46 @@ PEAR_FILES = \
        PEAR/Remote.php \
        System.php \
        XML/Parser.php 
-
-# These are moving to /pear (in cvs):
-#      Crypt/CBC.php \
-#      Crypt/HCEMD5.php \
-#      DB.php \
-#      DB/common.php \
-#      DB/fbsql.php \
-#      DB/ibase.php \
-#      DB/ifx.php \
-#      DB/msql.php \
-#      DB/mssql.php \
-#      DB/mysql.php \
-#      DB/oci8.php \
-#      DB/odbc.php \
-#      DB/pgsql.php \
-#      DB/storage.php \
-#      DB/sybase.php \
-#      Date/Calc.php \
-#      Date/Human.php \
-#      File/Find.php \
-#      File/Passwd.php \
-#      File/SearchReplace.php \
-#      HTML/Common.php \
-#      HTML/Form.php \
-#      HTML/IT.php \
-#      HTML/ITX.php \
-#      HTML/IT_Error.php \
-#      HTML/Page.php \
-#      HTML/Processor.php \
-#      HTML/Select.php \
-#      HTML/Table.php \
-#      HTTP.php \
-#      HTTP/Compress.php \
-#      Mail.php \
-#      Mail/RFC822.php \
-#      Mail/sendmail.php \
-#      Mail/smtp.php \
-#      Net/Curl.php \
-#      Net/Dig.php \
-#      Net/SMTP.php \
-#      Net/Socket.php \
-#      Schedule/At.php \
+        Crypt/CBC.php \
+        Crypt/HCEMD5.php \
+        DB.php \
+        DB/common.php \
+        DB/fbsql.php \
+        DB/ibase.php \
+        DB/ifx.php \
+        DB/msql.php \
+        DB/mssql.php \
+        DB/mysql.php \
+        DB/oci8.php \
+        DB/odbc.php \
+        DB/pgsql.php \
+        DB/storage.php \
+        DB/sybase.php \
+        Date/Calc.php \
+        Date/Human.php \
+        File/Find.php \
+        File/Passwd.php \
+        File/SearchReplace.php \
+        HTML/Common.php \
+        HTML/Form.php \
+        HTML/IT.php \
+        HTML/ITX.php \
+        HTML/IT_Error.php \
+        HTML/Page.php \
+        HTML/Processor.php \
+        HTML/Select.php \
+        HTML/Table.php \
+        HTTP.php \
+        HTTP/Compress.php \
+        Mail.php \
+        Mail/RFC822.php \
+        Mail/sendmail.php \
+        Mail/smtp.php \
+        Net/Curl.php \
+        Net/Dig.php \
+        Net/SMTP.php \
+        Net/Socket.php \
+       Schedule/At.php
 
 install-data-local:
        @if $(mkinstalldirs) $(INSTALL_ROOT)$(peardir); then \