patch 9.1.0527: inconsistent parameter in Makefiles for Vim executable
Problem: inconsistent parameter in Makefiles for Vim executable
Solution: consistently use $VIMPROG across all Makefiles
(RestorerZ)
closes: #15099
Signed-off-by: RestorerZ <restorer@mail2k.ru>
Signed-off-by: Christian Brabandt <cb@256bit.org>
diff --git a/runtime/doc/Make_mvc.mak b/runtime/doc/Make_mvc.mak
index f2fbc52..c387ef8 100644
--- a/runtime/doc/Make_mvc.mak
+++ b/runtime/doc/Make_mvc.mak
@@ -12,7 +12,7 @@
# Correct the following line for the where executeable file vim is installed.
# Please do not put the path in quotes.
-VIMEXE = D:\Programs\Vim\vim90\vim.exe
+VIMPROG = D:\Programs\Vim\vim90\vim.exe
# Correct the following line for the directory where iconv installed.
# Please do not put the path in quotes.
@@ -63,7 +63,7 @@
# Use Vim to generate the tags file. Can only be used when Vim has been
# compiled and installed. Supports multiple languages.
vimtags : $(DOCS)
- @"$(VIMEXE)" --clean -esX -V1 -u doctags.vim
+ @"$(VIMPROG)" --clean -esX -V1 -u doctags.vim
uganda.nsis.txt : uganda.???
@@ -105,7 +105,7 @@
# Check URLs in the help with "curl" or "powershell".
test_urls :
- "$(VIMEXE)" --clean -S test_urls.vim
+ "$(VIMPROG)" --clean -S test_urls.vim
clean :
$(RM) doctags.exe doctags.obj
diff --git a/runtime/doc/Makefile b/runtime/doc/Makefile
index 30a4f08..5f0786d 100644
--- a/runtime/doc/Makefile
+++ b/runtime/doc/Makefile
@@ -7,7 +7,7 @@
AWK = awk
# Set to $(VIMTARGET) when executed from src/Makefile.
-VIMEXE = vim
+VIMPROG = vim
# include the config.mk from the source directory. It's only needed to set
# AWK, used for "make html". Comment this out if the include gives problems.
@@ -25,7 +25,7 @@
# Use Vim to generate the tags file. Can only be used when Vim has been
# compiled and installed. Supports multiple languages.
vimtags: $(DOCS)
- @$(VIMEXE) --clean -esX -V1 -u doctags.vim
+ @$(VIMPROG) --clean -esX -V1 -u doctags.vim
# Use "doctags" to generate the tags file. Only works for English!
tags: doctags $(DOCS)
@@ -57,7 +57,7 @@
$${dpn} | uniq > $${trg%txt}$${dpn##*.}; \
done
# This files needs to be in dos fileformat for NSIS.
- $(VIMEXE) -e -X -u NONE --cmd "set notitle noicon nocp noml viminfo=" \
+ $(VIMPROG) -e -X -u NONE --cmd "set notitle noicon nocp noml viminfo=" \
-c "argdo write ++ff=dos" -c "qa" uganda.nsis.???
# Awk version of .txt to .html conversion.
@@ -91,7 +91,7 @@
# Check URLs in the help with "curl".
test_urls:
- $(VIMEXE) --clean -S test_urls.vim
+ $(VIMPROG) --clean -S test_urls.vim
clean:
-rm -f doctags *.html tags.ref