To: vim_dev@googlegroups.com
Subject: Patch 7.4.1556
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.4.1556
Problem:    "make install" changes the help tags file, causing it to differ
            from the repository.
Solution:   Move it aside and restore it.
Files:      src/Makefile


*** ../vim-7.4.1555/src/Makefile	2016-03-13 13:27:32.602376476 +0100
--- src/Makefile	2016-03-13 14:32:47.797595495 +0100
***************
*** 2112,2117 ****
--- 2112,2120 ----
  	-$(SHELL) ./installman.sh install $(DEST_MAN) "" $(INSTALLMANARGS)
  	@echo generating help tags
  # Generate the help tags with ":helptags" to handle all languages.
+ # Move the distributed tags file aside and restore it, to avoid it being
+ # different from the repository.
+ 	cd $(HELPSOURCE); mv -f tags tags.dist
  	-@cd $(HELPSOURCE); $(MAKE) VIMEXE=$(DEST_BIN)/$(VIMTARGET) vimtags
  	cd $(HELPSOURCE); \
  		files=`ls *.txt tags`; \
***************
*** 2121,2126 ****
--- 2124,2130 ----
  		chmod $(HELPMOD) $$files
  	$(INSTALL_DATA)  $(HELPSOURCE)/*.pl $(DEST_HELP)
  	chmod $(SCRIPTMOD) $(DEST_HELP)/*.pl
+ 	cd $(HELPSOURCE); mv -f tags.dist tags
  # install the menu files
  	$(INSTALL_DATA) $(SCRIPTSOURCE)/menu.vim $(SYS_MENU_FILE)
  	chmod $(VIMSCRIPTMOD) $(SYS_MENU_FILE)
*** ../vim-7.4.1555/src/version.c	2016-03-13 13:27:32.602376476 +0100
--- src/version.c	2016-03-13 14:32:13.577951233 +0100
***************
*** 745,746 ****
--- 745,748 ----
  {   /* Add new patch number below this line */
+ /**/
+     1556,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
33. You name your children Eudora, Mozilla and Dotcom.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///