summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Jackson <puremourning@gmail.com>2023-06-14 15:10:02 +0100
committerBram Moolenaar <Bram@vim.org>2023-06-14 15:10:02 +0100
commit8d687a7424b33b7ad7f6778b0c5d092a44f4bc3a (patch)
tree8123b8ececd0bac2734153b34cd7674f44241d64
parent95707037afa1aeae4f3494dc623a721ceed7fc4e (diff)
patch 9.0.1630: "make clean" at the toplevel failsv9.0.1630
Problem: "make clean" at the toplevel fails. Solution: Clean the indent and syntax directories in a sub-shell. (Ben Jackson, closes #12536, closes #12526)
-rw-r--r--Makefile6
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index f70fb85293..2448105415 100644
--- 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 c753acd379..51e2e6ec52 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1630,
+/**/
1629,
/**/
1628,