Skip to content

Commit b763eba

Browse files
committed
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.
1 parent 6098957 commit b763eba

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

src/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2115,11 +2115,11 @@ installrtbase: $(HELPSOURCE)/vim.1 $(DEST_VIM) $(DEST_RT) \
21152115
$(DEST_FTP) $(DEST_AUTO) $(DEST_AUTO)/xml $(DEST_PLUG) \
21162116
$(DEST_TUTOR) $(DEST_SPELL) $(DEST_COMP)
21172117
-$(SHELL) ./installman.sh install $(DEST_MAN) "" $(INSTALLMANARGS)
2118-
@echo generating help tags
21192118
# Generate the help tags with ":helptags" to handle all languages.
21202119
# Move the distributed tags file aside and restore it, to avoid it being
21212120
# different from the repository.
2122-
cd $(HELPSOURCE); mv -f tags tags.dist
2121+
cd $(HELPSOURCE); if test -f tags; then mv -f tags tags.dist; fi
2122+
@echo generating help tags
21232123
-@cd $(HELPSOURCE); $(MAKE) VIMEXE=$(DEST_BIN)/$(VIMTARGET) vimtags
21242124
cd $(HELPSOURCE); \
21252125
files=`ls *.txt tags`; \
@@ -2129,7 +2129,7 @@ installrtbase: $(HELPSOURCE)/vim.1 $(DEST_VIM) $(DEST_RT) \
21292129
chmod $(HELPMOD) $$files
21302130
$(INSTALL_DATA) $(HELPSOURCE)/*.pl $(DEST_HELP)
21312131
chmod $(SCRIPTMOD) $(DEST_HELP)/*.pl
2132-
cd $(HELPSOURCE); mv -f tags.dist tags
2132+
cd $(HELPSOURCE); if test -f tags.dist; then mv -f tags.dist tags; fi
21332133
# install the menu files
21342134
$(INSTALL_DATA) $(SCRIPTSOURCE)/menu.vim $(SYS_MENU_FILE)
21352135
chmod $(VIMSCRIPTMOD) $(SYS_MENU_FILE)

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -748,6 +748,8 @@ static char *(features[]) =
748748

749749
static int included_patches[] =
750750
{ /* Add new patch number below this line */
751+
/**/
752+
1633,
751753
/**/
752754
1632,
753755
/**/

0 commit comments

Comments
 (0)