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 b81109192f

Here are the changes and the reasons for them:

- Delete the comment preceding the assignment to VIMPROG. Since b81109192f
  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 b81109192f 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>

diff --git a/runtime/doc/Makefile b/runtime/doc/Makefile
index 9cb38aafc917a07697a6131604e3b247e863a858..38f505367c61c3212290e287718aac52a16c2e6d 100644 (file)
--- a/runtime/doc/Makefile
+++ b/runtime/doc/Makefile
@@ -6,7 +6,6 @@
 
 AWK = awk
 
-# Set to $(VIMTARGET) when executed from src/Makefile.
 VIMPROG = ../../src/vim
 
 # 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)
 
 # 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)
        @$(VIMPROG) --clean -esX -V1 -u doctags.vim
 

diff --git a/src/Makefile b/src/Makefile
index a451ee5aa45cf6ba247259d5692eaf8a8945f8cc..2da0c6f4af46d39d6e0c43f98b4b6d6629d7bb0e 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -2354,10 +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
-       # We can assume Vim was build, but it may not have been installed,
-       # thus use the executable in the current directory.
-       -@BUILD_DIR="`pwd`"; cd $(HELPSOURCE); if test -z "$(CROSS_COMPILING)"; then \
-               $(MAKE) VIMPROG="$$BUILD_DIR/$(VIMTARGET)" vimtags; fi
+       -@cd $(HELPSOURCE); if test -z "$(CROSS_COMPILING)"; then \
+               $(MAKE) 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 bd7457384bfd3c2f9c27c1b22c05a0e931847378..972293a8c3b8b357b36fa9b00ed8666a88b585c9 100644 (file)
--- 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 */
+/**/
+    609,
 /**/
     608,
 /**/