diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-03-21 22:40:03 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-03-21 22:40:03 +0100 |
| commit | b763eba7ae3540cd879f7c29882a29308f9688db (patch) | |
| tree | 74a271183ac76fb3b5245be200e3f89251a343df | |
| parent | 6098957458e538682f54e23de217da06200876a3 (diff) | |
| download | vim-git-b763eba7ae3540cd879f7c29882a29308f9688db.tar.gz | |
patch 7.4.1633v7.4.1633
Problem: If the help tags file was removed "make install" fails. (Tony
Mechelynck)
Solution: Only try moving the file if it exists.
| -rw-r--r-- | src/Makefile | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/Makefile b/src/Makefile index 584926606..e018811d2 100644 --- a/src/Makefile +++ b/src/Makefile @@ -2115,11 +2115,11 @@ installrtbase: $(HELPSOURCE)/vim.1 $(DEST_VIM) $(DEST_RT) \ $(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 $(DEST_VIM) $(DEST_RT) \ 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 index bb75c115f..3f45bd64b 100644 --- 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, |