# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1724610603 -7200
# Node ID 1a397304cb28e30bd7118003205338fa1b63c0c0
# Parent  2690d8f3c8793c2e3a246e2bea2d956092f3f239
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>

diff --git a/src/Makefile b/src/Makefile
--- 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`"; \
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    696,
+/**/
     695,
 /**/
     694,