diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-03-13 14:34:12 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-03-13 14:34:12 +0100 |
| commit | a3442cb5056ca62fc71fa03f68a9395e4391caf4 (patch) | |
| tree | 2990ee7a4fccdfa0624cf3b08e05d2814f122d66 | |
| parent | fff341eb5960f656529b56c949043f041eddbb1e (diff) | |
| download | vim-git-a3442cb5056ca62fc71fa03f68a9395e4391caf4.tar.gz | |
patch 7.4.1556v7.4.1556
Problem: "make install" changes the help tags file, causing it to differ
from the repository.
Solution: Move it aside and restore it.
| -rw-r--r-- | src/Makefile | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/Makefile b/src/Makefile index 2b17db5a4..a52a1f3b8 100644 --- a/src/Makefile +++ b/src/Makefile @@ -2112,6 +2112,9 @@ installrtbase: $(HELPSOURCE)/vim.1 $(DEST_VIM) $(DEST_RT) \ -$(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,6 +2124,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 # 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 38d89c1a8..9c15aafc8 100644 --- a/src/version.c +++ b/src/version.c @@ -744,6 +744,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1556, +/**/ 1555, /**/ 1554, |