patch 7.4.1004

Problem:    Using Makefile when auto/config.mk does not exists results in
            warnings.
Solution:   Use default values for essential variables.

diff --git a/src/Makefile b/src/Makefile
index 522678cd6df4d366f0fc8f0a7f0aa553a65aef43..e3b8c9fcca8afcbb30a908f31453678fffced326 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -281,6 +281,12 @@ CC=
 #GUI_LIB_LOC = -L/usr/X11R6/lib
 # }}}
 
+# Defaults used when auto/config.mk does not exist.
+srcdir = .
+VIMNAME = vim
+EXNAME = ex
+VIEWNAME = view
+
 ######################## auto/config.mk ######################## {{{1
 # At this position auto/config.mk is included. When starting from the
 # toplevel Makefile it is almost empty. After running auto/configure it

diff --git a/src/version.c b/src/version.c
index dc25a82547fc7c7891a0ec920b361ff6f480b03d..07ac05fa8dea22af6dd359d35afcced1ae0228ca 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1004,
 /**/
     1003,
 /**/