patch 9.1.0696: installing runtime files fails when using SHADOWDIR
Commit:
https://github.com/vim/vim/commit/663950d700f496c1db09307253e6b1b2a56140d5
Author: James McCoy <james...@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 <james...@jamessan.com>
Signed-off-by: Christian Brabandt <c...@256bit.org>
diff --git a/src/Makefile b/src/Makefile
index 875a0de6a..257742f4c 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -2354,8 +2354,8 @@ installrtbase: $(HELPSOURCE)/vim.1 $(DEST_VIM)
$(VIMTARGET) $(DEST_RT) \
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`"; \
diff --git a/src/version.c b/src/version.c
index 8252d9f30..b07964e2d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 696,
/**/
695,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/E1siI03-007fRd-I9%40256bit.org.
