From 9631885246aba26447c6b0437a5e0f0850736332 Mon Sep 17 00:00:00 2001 From: Stig Bakken Date: Fri, 22 Mar 2002 10:28:27 +0000 Subject: [PATCH] * temporarily added: nuke old files/dirs --- pear/Makefile.frag | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pear/Makefile.frag b/pear/Makefile.frag index 768d7596608..2c65355a22b 100644 --- a/pear/Makefile.frag +++ b/pear/Makefile.frag @@ -95,11 +95,16 @@ install-pear: for i in $(PEAR_SUBDIRS); do \ $(mkinstalldirs) $(INSTALL_ROOT)$(peardir)/$$i; \ done; \ + for dir in PEAR/CommandUI; do \ + test -d $(INSTALL_ROOT)$(peardir)/$$dir && rmdir $(INSTALL_ROOT)$(peardir)/$$dir; \ + done; \ for i in $(PEAR_FILES); do \ echo "Installing $$i"; \ dir=`echo $$i|sed 's%[^/][^/]*$$%%'`; \ $(INSTALL_DATA) $(srcdir)/$$i $(INSTALL_ROOT)$(peardir)/$$dir; \ done; \ + rm -f $(INSTALL_ROOT)$(peardir)/PEAR/Command/Login.php; \ + rm -f $(INSTALL_ROOT)$(peardir)/PEAR/CommandUI/CLI.php; \ else \ cat $(srcdir)/install-pear.txt; \ exit 5; \ @@ -128,6 +133,9 @@ install-programs: echo "Installing program: $$prog"; \ $(INSTALL) -m 755 $(builddir)/scripts/$$prog $(INSTALL_ROOT)$(bindir)/$$prog; \ done; \ + for file in $(INSTALL_ROOT)$(bindir)/pearcmd-*.php; do \ + rm -f $$file; \ + done; \ for prog in phpextdist; do \ echo "Installing program: $$prog"; \ $(INSTALL) -m 755 $(srcdir)/scripts/$$prog $(INSTALL_ROOT)$(bindir)/$$prog; \