To: vim-dev@vim.org
Subject: Patch 6.1.214
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 6.1.214
Problem:    When installing Vim and the runtime files were checked out from
	    CVS the CVS directories will also be installed.
Solution:   Avoid installing the CVS dirs and their contents.
Files:	    src/Makefile


*** ../vim61.213/src/Makefile	Tue Jul  9 21:50:11 2002
--- src/Makefile	Fri Oct 11 14:39:45 2002
***************
*** 1598,1605 ****
  	cd $(SYNSOURCE); $(INSTALL_DATA) *.vim README.txt $(DEST_SYN)
  	cd $(DEST_SYN); chmod $(HELPMOD) *.vim README.txt
  # install the indent files
! 	cd $(INDSOURCE); $(INSTALL_DATA) *.vim $(DEST_IND)
! 	cd $(DEST_IND); chmod $(HELPMOD) *.vim
  # install the standard plugin files
  	cd $(PLUGSOURCE); $(INSTALL_DATA) *.vim README.txt $(DEST_PLUG)
  	cd $(DEST_PLUG); chmod $(HELPMOD) *.vim README.txt
--- 1598,1605 ----
  	cd $(SYNSOURCE); $(INSTALL_DATA) *.vim README.txt $(DEST_SYN)
  	cd $(DEST_SYN); chmod $(HELPMOD) *.vim README.txt
  # install the indent files
! 	cd $(INDSOURCE); $(INSTALL_DATA) *.vim README.txt $(DEST_IND)
! 	cd $(DEST_IND); chmod $(HELPMOD) *.vim README.txt
  # install the standard plugin files
  	cd $(PLUGSOURCE); $(INSTALL_DATA) *.vim README.txt $(DEST_PLUG)
  	cd $(DEST_PLUG); chmod $(HELPMOD) *.vim README.txt
***************
*** 1615,1626 ****
  	chmod $(DIRMOD) `find $(DEST_MACRO) -type d -print`
  	chmod $(FILEMOD) `find $(DEST_MACRO) -type f -print`
  	chmod $(SCRIPTMOD) $(DEST_MACRO)/less.sh
  
  # install the tutor files
  installtutor: $(TUTORSOURCE) $(DEST_VIM) $(DEST_RT) $(DEST_TUTOR)
  	$(INSTALL_DATA) vimtutor $(DEST_BIN)/$(VIMNAME)tutor
  	chmod $(SCRIPTMOD) $(DEST_BIN)/$(VIMNAME)tutor
! 	-$(INSTALL_DATA) $(TUTORSOURCE)/* $(DEST_TUTOR)
  	chmod $(HELPMOD) $(DEST_TUTOR)/*
  
  # install helper program xxd
--- 1615,1631 ----
  	chmod $(DIRMOD) `find $(DEST_MACRO) -type d -print`
  	chmod $(FILEMOD) `find $(DEST_MACRO) -type f -print`
  	chmod $(SCRIPTMOD) $(DEST_MACRO)/less.sh
+ 	# When using CVS some CVS directories might have been copied.
+ 	cvs=`find $(DEST_MACRO) -name CVS -print`; \
+ 	      if test -n "$$cvs"; then \
+ 	         rm -rf $$cvs; \
+ 	      fi
  
  # install the tutor files
  installtutor: $(TUTORSOURCE) $(DEST_VIM) $(DEST_RT) $(DEST_TUTOR)
  	$(INSTALL_DATA) vimtutor $(DEST_BIN)/$(VIMNAME)tutor
  	chmod $(SCRIPTMOD) $(DEST_BIN)/$(VIMNAME)tutor
! 	-$(INSTALL_DATA) $(TUTORSOURCE)/README* $(TUTORSOURCE)/tutor* $(DEST_TUTOR)
  	chmod $(HELPMOD) $(DEST_TUTOR)/*
  
  # install helper program xxd
***************
*** 1637,1642 ****
--- 1642,1652 ----
  	chmod $(MANMOD) $(DEST_MAN)/xxd.1
  # install the runtime tools
  	$(INSTALL_DATA_R) $(TOOLSSOURCE)/* $(DEST_TOOLS)
+ 	# When using CVS some CVS directories might have been copied.
+ 	cvs=`find $(DEST_TOOLS) -name CVS -print`; \
+ 	      if test -n "$$cvs"; then \
+ 	         rm -rf $$cvs; \
+ 	      fi
  	-chmod $(FILEMOD) $(DEST_TOOLS)/*
  # replace the path in some tools
  	perlpath=`./which.sh perl` && sed -e "s+/usr/bin/perl+$$perlpath+" $(TOOLSSOURCE)/efm_perl.pl >$(DEST_TOOLS)/efm_perl.pl
***************
*** 1823,1829 ****
  	-rm -f $(SYS_OPTWIN_FILE) $(SYS_PROCSET_FILE)
  	-rm -f $(SYS_EVISO_FILE) $(SYS_EVEBCDIC_FILE)
  	-rm -f $(DEST_COL)/*.vim $(DEST_COL)/README.txt
! 	-rm -f $(DEST_SYN)/*.vim $(DEST_SYN)/README.txt $(DEST_IND)/*.vim
  	-rm -rf $(DEST_MACRO)
  	-rm -rf $(DEST_TUTOR)
  	-rm -rf $(DEST_TOOLS)
--- 1833,1840 ----
  	-rm -f $(SYS_OPTWIN_FILE) $(SYS_PROCSET_FILE)
  	-rm -f $(SYS_EVISO_FILE) $(SYS_EVEBCDIC_FILE)
  	-rm -f $(DEST_COL)/*.vim $(DEST_COL)/README.txt
! 	-rm -f $(DEST_SYN)/*.vim $(DEST_SYN)/README.txt
! 	-rm -f $(DEST_IND)/*.vim $(DEST_IND)/README.txt
  	-rm -rf $(DEST_MACRO)
  	-rm -rf $(DEST_TUTOR)
  	-rm -rf $(DEST_TOOLS)
*** ../vim61.213/src/version.c	Tue Oct  8 20:05:55 2002
--- src/version.c	Fri Oct 11 15:31:26 2002
***************
*** 608,609 ****
--- 608,611 ----
  {   /* Add new patch number below this line */
+ /**/
+     214,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
193. You ask your girlfriend to drive home so you can sit back with
     your PDA and download the information to your laptop

 ///  Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net  \\\
///          Creator of Vim - Vi IMproved -- http://www.vim.org          \\\
\\\           Project leader for A-A-P -- http://www.a-a-p.org           ///
 \\\ Lord Of The Rings helps Uganda - http://iccf-holland.org/lotr.html ///