Mercurial > vim
changeset 36046:1a397304cb28 v9.1.0696
patch 9.1.0696: installing runtime files fails when using SHADOWDIR
Commit: https://github.com/vim/vim/commit/663950d700f496c1db09307253e6b1b2a56140d5
Author: James McCoy <jamessan@jamessan.com>
Date: Sun Aug 25 20:22:11 2024 +0200
patch 9.1.0696: installing runtime files fails when using SHADOWDIR
Problem: installing runtime files fails when using SHADOWDIR
Solution: revert part of v9.1.0609, since runtime/doc/Makefile's default
value for VIMPROG does not work if vim was built in a SHADOWDIR.
(James McCoy)
closes: #15575
Signed-off-by: James McCoy <jamessan@jamessan.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 25 Aug 2024 20:30:03 +0200 |
| parents | 2690d8f3c879 |
| children | 54207453a922 |
| files | src/Makefile src/version.c |
| diffstat | 2 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/Makefile +++ b/src/Makefile @@ -2354,8 +2354,8 @@ installrtbase: $(HELPSOURCE)/vim.1 $(DES cd $(HELPSOURCE); if test -z "$(CROSS_COMPILING)" -a -f tags; then \ mv -f tags tags.dist; fi @echo generating help tags - -@cd $(HELPSOURCE); if test -z "$(CROSS_COMPILING)"; then \ - $(MAKE) vimtags; fi + -@BUILD_DIR=`pwd`; cd $(HELPSOURCE); if test -z "$(CROSS_COMPILING)"; then \ + $(MAKE) VIMPROG="$$BUILD_DIR/$(VIMTARGET)" vimtags; fi cd $(HELPSOURCE); \ files=`ls *.txt tags`; \ files="$$files `ls *.??x tags-?? 2>/dev/null || true`"; \