Mercurial > vim

changeset 7399:d45f2dbdac8d v7.4.1004

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/08b7bae91adb79d30d4c923fd758e2f7cecd33ef Author: Bram Moolenaar <Bram@vim.org> Date: Wed Dec 30 17:56:05 2015 +0100 patch 7.4.1004 Problem: Using Makefile when auto/config.mk does not exists results in warnings. Solution: Use default values for essential variables.
author Christian Brabandt <cb@256bit.org>
date Wed, 30 Dec 2015 18:00:04 +0100
parents f4bed3aff750
children 8bdfc85a6e09
files src/Makefile src/version.c
diffstat 2 files changed, 8 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1004,
+/**/
     1003,
 /**/
     1002,