patch 9.0.1630: "make clean" at the toplevel fails

Problem:    "make clean" at the toplevel fails.
Solution:   Clean the indent and syntax directories in a sub-shell.  (Ben
            Jackson, closes #12536, closes #12526)

diff --git a/Makefile b/Makefile
index f70fb852931d9f73db6ec1fcd584180d8c1dea1d..24481054158c4da0cde6034fa20427252130bde8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -46,10 +46,8 @@ all install uninstall tools config configure reconfig proto depend lint tags typ
        fi
        @# When the target is "clean" also clean for the indent and syntax tests.
        @if test "$@" = "clean" -o "$@" = "distclean" -o "$@" = "testclean"; then \
-               cd runtime/indent && \
-                       $(MAKE) clean; \
-               cd runtime/syntax && \
-                       $(MAKE) clean; \
+               (cd runtime/indent && $(MAKE) clean); \
+               (cd runtime/syntax && $(MAKE) clean); \
        fi
 
 # Executable used for running the indent tests.

diff --git a/src/version.c b/src/version.c
index c753acd3794212749e159fd61e22a79a55a8f1a4..51e2e6ec529fd6a44277122dca1a3c4ef048358f 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1630,
 /**/
     1629,
 /**/