forked from aniani/vim
patch 9.1.0609: outdated comments in Makefile
Problem: outdated comments in Makefile Solution: update outdated comments, update rule for vimtags (Shane Harper) related: commitb81109192f
Here are the changes and the reasons for them: - Delete the comment preceding the assignment to VIMPROG. Sinceb81109192f
there's no need for VIMPROG to be set to something else when this is executed from src/Makefile. (The comment was wrong anyway; VIMPROG was being set to "$$BUILD_DIR/$(VIMTARGET)".) ``` # Set to $(VIMTARGET) when executed from src/Makefile. VIMPROG = ../../src/vim ``` - Delete "`and installed`" in the following comment; The vimtags rule doesn't require that Vim has been installed. ``` # Use Vim to generate the tags file. Can only be used when Vim has been # compiled and installed. Supports multiple languages. vimtags: $(DOCS) ``` - With commitb81109192f
there is no longer a need to set VIMPROG here: ``` -@BUILD_DIR="`pwd`"; cd $(HELPSOURCE); if test -z "$(CROSS_COMPILING)"; then \ $(MAKE) VIMPROG="$$BUILD_DIR/$(VIMTARGET)" vimtags; fi ``` The new code below will use the same vim executable as the old code: ``` -@cd $(HELPSOURCE); if test -z "$(CROSS_COMPILING)"; then \ $(MAKE) vimtags; fi ``` - Delete the following comment which was related to setting VIMPROG as it no longer has any value: ``` # We can assume Vim was build, but it may not have been installed, # thus use the executable in the current directory. ``` Note: this comment used to be (unnecessarily) echoed to the terminal (because it was indented) when making installrtbase. closes: #15320 Signed-off-by: Shane Harper <shane@shaneharper.net> Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
committed by
Christian Brabandt
parent
6e37575760
commit
4c3616d7a2
@@ -6,7 +6,6 @@
|
|||||||
|
|
||||||
AWK = awk
|
AWK = awk
|
||||||
|
|
||||||
# Set to $(VIMTARGET) when executed from src/Makefile.
|
|
||||||
VIMPROG = ../../src/vim
|
VIMPROG = ../../src/vim
|
||||||
|
|
||||||
# include the config.mk from the source directory. It's only needed to set
|
# include the config.mk from the source directory. It's only needed to set
|
||||||
@@ -23,7 +22,7 @@ include Make_all.mak
|
|||||||
all: tags vim.man evim.man vimdiff.man vimtutor.man xxd.man $(CONVERTED)
|
all: tags vim.man evim.man vimdiff.man vimtutor.man xxd.man $(CONVERTED)
|
||||||
|
|
||||||
# Use Vim to generate the tags file. Can only be used when Vim has been
|
# Use Vim to generate the tags file. Can only be used when Vim has been
|
||||||
# compiled and installed. Supports multiple languages.
|
# compiled. Supports multiple languages.
|
||||||
vimtags: $(DOCS)
|
vimtags: $(DOCS)
|
||||||
@$(VIMPROG) --clean -esX -V1 -u doctags.vim
|
@$(VIMPROG) --clean -esX -V1 -u doctags.vim
|
||||||
|
|
||||||
|
@@ -2354,10 +2354,8 @@ installrtbase: $(HELPSOURCE)/vim.1 $(DEST_VIM) $(VIMTARGET) $(DEST_RT) \
|
|||||||
cd $(HELPSOURCE); if test -z "$(CROSS_COMPILING)" -a -f tags; then \
|
cd $(HELPSOURCE); if test -z "$(CROSS_COMPILING)" -a -f tags; then \
|
||||||
mv -f tags tags.dist; fi
|
mv -f tags tags.dist; fi
|
||||||
@echo generating help tags
|
@echo generating help tags
|
||||||
# We can assume Vim was build, but it may not have been installed,
|
-@cd $(HELPSOURCE); if test -z "$(CROSS_COMPILING)"; then \
|
||||||
# thus use the executable in the current directory.
|
$(MAKE) vimtags; fi
|
||||||
-@BUILD_DIR="`pwd`"; cd $(HELPSOURCE); if test -z "$(CROSS_COMPILING)"; then \
|
|
||||||
$(MAKE) VIMPROG="$$BUILD_DIR/$(VIMTARGET)" vimtags; fi
|
|
||||||
cd $(HELPSOURCE); \
|
cd $(HELPSOURCE); \
|
||||||
files=`ls *.txt tags`; \
|
files=`ls *.txt tags`; \
|
||||||
files="$$files `ls *.??x tags-?? 2>/dev/null || true`"; \
|
files="$$files `ls *.??x tags-?? 2>/dev/null || true`"; \
|
||||||
|
@@ -704,6 +704,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
609,
|
||||||
/**/
|
/**/
|
||||||
608,
|
608,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user