Mercurial > vim
changeset 15221:516a9833c5cd v8.1.0620
patch 8.1.0620: overuling CONF_ARGS from the environment no longer works
commit https://github.com/vim/vim/commit/3ac55c86449de57f63fa1cc2ac19202c1aa1ebb9
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Dec 22 14:59:03 2018 +0100
patch 8.1.0620: overuling CONF_ARGS from the environment no longer works
Problem: Overuling CONF_ARGS from the environment no longer works. (Tony
Mechelynck)
Solution: Do not define any CONF_ARGS by default.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 22 Dec 2018 15:00:08 +0100 |
| parents | 28446528eeb1 |
| children | c4a379734f18 |
| files | src/Makefile src/version.c |
| diffstat | 2 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/Makefile +++ b/src/Makefile @@ -323,10 +323,9 @@ CClink = $(CC) #CONF_ARGS3 = --with-global-runtime=/etc/vim,/usr/share/vim #CONF_ARGS4 = --with-local-dir=/usr/share #CONF_ARGS5 = --without-local-dir -CONF_ARGS = $(CONF_ARGS1) $(CONF_ARGS2) $(CONF_ARGS3) $(CONF_ARGS4) $(CONF_ARGS5) # Use this one if you distribute a modified version of Vim. -#CONF_ARGS = --with-modified-by="John Doe" +#CONF_ARGS6 = --with-modified-by="John Doe" # GUI - For creating Vim with GUI (gvim) (B) # Uncomment this line when you don't want to get the GUI version, although you @@ -1933,7 +1932,9 @@ config auto/config.mk: auto/configure co $(CONF_OPT_FEAT) $(CONF_TERM_LIB) \ $(CONF_OPT_COMPBY) $(CONF_OPT_ACL) $(CONF_OPT_NETBEANS) \ $(CONF_OPT_CHANNEL) $(CONF_OPT_TERMINAL) \ - $(CONF_ARGS) $(CONF_OPT_MZSCHEME) $(CONF_OPT_PLTHOME) \ + $(CONF_ARGS1) $(CONF_ARGS2) $(CONF_ARGS3) $(CONF_ARGS4) \ + $(CONF_ARGS5) $(CONF_ARGS6) \ + $(CONF_OPT_MZSCHEME) $(CONF_OPT_PLTHOME) \ $(CONF_OPT_LUA) $(CONF_OPT_LUA_PREFIX) \ $(CONF_OPT_SYSMOUSE); \ fi