# HG changeset patch # User Christian Brabandt # Date 1458596706 -3600 # Node ID 7ec1aa86dc808330c4fcd2b88758f9869283ec70 # Parent 244b5178dc32877586870786a8fe8923d41675b6 commit https://github.com/vim/vim/commit/b763eba7ae3540cd879f7c29882a29308f9688db Author: Bram Moolenaar Date: Mon Mar 21 22:40:03 2016 +0100 patch 7.4.1633 Problem: If the help tags file was removed "make install" fails. (Tony Mechelynck) Solution: Only try moving the file if it exists. diff --git a/src/Makefile b/src/Makefile --- a/src/Makefile +++ b/src/Makefile @@ -2115,11 +2115,11 @@ installrtbase: $(HELPSOURCE)/vim.1 $(DES $(DEST_FTP) $(DEST_AUTO) $(DEST_AUTO)/xml $(DEST_PLUG) \ $(DEST_TUTOR) $(DEST_SPELL) $(DEST_COMP) -$(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); if test -f tags; then mv -f tags tags.dist; fi + @echo generating help tags -@cd $(HELPSOURCE); $(MAKE) VIMEXE=$(DEST_BIN)/$(VIMTARGET) vimtags cd $(HELPSOURCE); \ files=`ls *.txt tags`; \ @@ -2129,7 +2129,7 @@ installrtbase: $(HELPSOURCE)/vim.1 $(DES chmod $(HELPMOD) $$files $(INSTALL_DATA) $(HELPSOURCE)/*.pl $(DEST_HELP) chmod $(SCRIPTMOD) $(DEST_HELP)/*.pl - cd $(HELPSOURCE); mv -f tags.dist tags + cd $(HELPSOURCE); if test -f tags.dist; then mv -f tags.dist tags; fi # install the menu files $(INSTALL_DATA) $(SCRIPTSOURCE)/menu.vim $(SYS_MENU_FILE) chmod $(VIMSCRIPTMOD) $(SYS_MENU_FILE) diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -749,6 +749,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1633, +/**/ 1632, /**/ 1631,