Skip to content

Commit 4c3616d

Browse files
shaneharperchrisbra
authored andcommitted
patch 9.1.0609: outdated comments in Makefile
Problem: outdated comments in Makefile Solution: update outdated comments, update rule for vimtags (Shane Harper) related: commit b811091 Here are the changes and the reasons for them: - Delete the comment preceding the assignment to VIMPROG. Since b811091 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 commit b811091 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 <[email protected]> Signed-off-by: Christian Brabandt <[email protected]>
1 parent 6e37575 commit 4c3616d

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

runtime/doc/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
AWK = awk
88

9-
# Set to $(VIMTARGET) when executed from src/Makefile.
109
VIMPROG = ../../src/vim
1110

1211
# include the config.mk from the source directory. It's only needed to set
@@ -23,7 +22,7 @@ include Make_all.mak
2322
all: tags vim.man evim.man vimdiff.man vimtutor.man xxd.man $(CONVERTED)
2423

2524
# Use Vim to generate the tags file. Can only be used when Vim has been
26-
# compiled and installed. Supports multiple languages.
25+
# compiled. Supports multiple languages.
2726
vimtags: $(DOCS)
2827
@$(VIMPROG) --clean -esX -V1 -u doctags.vim
2928

src/Makefile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2354,10 +2354,8 @@ installrtbase: $(HELPSOURCE)/vim.1 $(DEST_VIM) $(VIMTARGET) $(DEST_RT) \
23542354
cd $(HELPSOURCE); if test -z "$(CROSS_COMPILING)" -a -f tags; then \
23552355
mv -f tags tags.dist; fi
23562356
@echo generating help tags
2357-
# We can assume Vim was build, but it may not have been installed,
2358-
# thus use the executable in the current directory.
2359-
-@BUILD_DIR="`pwd`"; cd $(HELPSOURCE); if test -z "$(CROSS_COMPILING)"; then \
2360-
$(MAKE) VIMPROG="$$BUILD_DIR/$(VIMTARGET)" vimtags; fi
2357+
-@cd $(HELPSOURCE); if test -z "$(CROSS_COMPILING)"; then \
2358+
$(MAKE) vimtags; fi
23612359
cd $(HELPSOURCE); \
23622360
files=`ls *.txt tags`; \
23632361
files="$$files `ls *.??x tags-?? 2>/dev/null || true`"; \

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -704,6 +704,8 @@ static char *(features[]) =
704704

705705
static int included_patches[] =
706706
{ /* Add new patch number below this line */
707+
/**/
708+
609,
707709
/**/
708710
608,
709711
/**/

0 commit comments

Comments
 (0)