From 663950d700f496c1db09307253e6b1b2a56140d5 Mon Sep 17 00:00:00 2001 From: James McCoy Date: Sun, 25 Aug 2024 20:22:11 +0200 Subject: [PATCH] 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 Signed-off-by: Christian Brabandt --- src/Makefile | 4 ++-- src/version.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Makefile b/src/Makefile index 875a0de6a2..257742f4ce 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 8252d9f308..b07964e2d7 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, /**/