diff options
| author | Bram Moolenaar <Bram@vim.org> | 2015-12-30 17:56:05 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2015-12-30 17:56:05 +0100 |
| commit | 08b7bae91adb79d30d4c923fd758e2f7cecd33ef (patch) | |
| tree | d9a36b05ca80190644f795f02687a6c0484bf5d1 | |
| parent | 7b5f0a15bce11754c47f849b2ddd68ba0909afac (diff) | |
patch 7.4.1004v7.4.1004
Problem: Using Makefile when auto/config.mk does not exists results in
warnings.
Solution: Use default values for essential variables.
| -rw-r--r-- | src/Makefile | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/Makefile b/src/Makefile index 522678cd6d..e3b8c9fcca 100644 --- 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 dc25a82547..07ac05fa8d 100644 --- 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, |