* MFH Makefile

diff --git a/pear/Makefile.in b/pear/Makefile.in
index f5b01e7bf6c0e75e31745ceafc33283eda3f0bcd..3b60935a7c09e1815a3bc45c2d48b88954c2fd83 100644 (file)
--- a/pear/Makefile.in
+++ b/pear/Makefile.in
@@ -12,63 +12,26 @@ peardir=$(PEAR_INSTALLDIR)
 PEAR_SUBDIRS = \
        Archive \
        Console \
-       Crypt \
-       Date \
-       DB \
-       File \
-       HTML \
-       HTTP \
-       Image \
-       Mail \
-       Net \
        PEAR \
        PEAR/Command \
        PEAR/Frontend \
-       Schedule \
        XML 
 
+# These are moving to /pear (in cvs):
+#      Crypt \
+#      File \
+#      Date \
+#      DB \
+#      HTML \
+#      HTTP \
+#      Image \
+#      Mail \
+#      Net \
+#      Schedule \
+
 PEAR_FILES = \
        Archive/Tar.php \
        Console/Getopt.php \
-       Crypt/CBC.php \
-       Crypt/HCEMD5.php \
-       Date/Calc.php \
-       Date/Human.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 \
-       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 \
        PEAR.php \
        PEAR/Autoloader.php \
        PEAR/Command.php \
@@ -79,19 +42,59 @@ PEAR_FILES = \
        PEAR/Command/Package.php \
        PEAR/Command/Registry.php \
        PEAR/Command/Remote.php \
+       PEAR/Frontend/CLI.php \
        PEAR/Common.php \
        PEAR/Config.php \
        PEAR/Dependency.php \
-       PEAR/Frontend/CLI.php \
        PEAR/Installer.php \
        PEAR/Packager.php \
        PEAR/Registry.php \
        PEAR/Remote.php \
-       PEAR/Uploader.php \
-       Schedule/At.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 \
+
 install-data-local:
        @if $(mkinstalldirs) $(INSTALL_ROOT)$(peardir); then \
                for i in $(PEAR_SUBDIRS); do \
@@ -102,6 +105,7 @@ install-data-local:
                        dir=`echo $$i|sed 's%[^/][^/]*$$%%'`; \
                        $(INSTALL_DATA) $(srcdir)/$$i $(INSTALL_ROOT)$(peardir)/$$dir; \
                done; \
+               rm -f $(INSTALL_ROOT)$(peardir)/PEAR/Uploader.php; \
        else \
                cat $(srcdir)/install-pear.txt; \
                exit 5; \