summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile14
-rw-r--r--src/version.c2
2 files changed, 13 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 3e69d4501c..2155b588ac 100644
--- a/Makefile
+++ b/Makefile
@@ -39,10 +39,18 @@ all install uninstall tools config configure reconfig proto depend lint tags typ
@echo "Starting make in the src directory."
@echo "If there are problems, cd to the src directory and run make there"
cd src && $(MAKE) $@
+ # When the target is "test" also run the indent tests.
+ @if test "$@" = "test"; then \
+ $(MAKE) indenttest; \
+ fi
+
+# Executable used for running the indent tests.
+VIM_FOR_INDENTTEST = ../../src/vim
-test: all
- cd src && $(MAKE) test
- cd runtime/indent && $(MAKE) clean && $(MAKE) test
+indenttest:
+ cd runtime/indent && \
+ $(MAKE) clean VIM="$(VIM_FOR_INDENTTEST)" && \
+ $(MAKE) test VIM="$(VIM_FOR_INDENTTEST)"
#########################################################################
diff --git a/src/version.c b/src/version.c
index a85295a6cb..7e8b34efeb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -800,6 +800,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 598,
+/**/
597,
/**/
596,