Mercurial > vim
changeset 8688:7ec1aa86dc80 v7.4.1633
commit https://github.com/vim/vim/commit/b763eba7ae3540cd879f7c29882a29308f9688db
Author: Bram Moolenaar <Bram@vim.org>
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.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Mon, 21 Mar 2016 22:45:06 +0100 |
| parents | 244b5178dc32 |
| children | 63d1d06fb303 |
| files | src/Makefile src/version.c |
| diffstat | 2 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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)