Mercurial > vim
changeset 8532:3de84783c029 v7.4.1556
commit https://github.com/vim/vim/commit/a3442cb5056ca62fc71fa03f68a9395e4391caf4
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Mar 13 14:34:12 2016 +0100
patch 7.4.1556
Problem: "make install" changes the help tags file, causing it to differ
from the repository.
Solution: Move it aside and restore it.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 13 Mar 2016 14:45:04 +0100 |
| parents | ac50d63008fd |
| children | 12c443cb2f05 |
| files | src/Makefile src/version.c |
| diffstat | 2 files changed, 6 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/Makefile +++ b/src/Makefile @@ -2112,6 +2112,9 @@ installrtbase: $(HELPSOURCE)/vim.1 $(DES -$(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 $(DES 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)