Mercurial > vim

comparison src/Makefile @ 15221:516a9833c5cd v8.1.0620

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 54d2905bd5ab
children 34f71bcceecd
comparison
equal deleted inserted replaced
15220:28446528eeb1 15221:516a9833c5cd
321 #CONF_ARGS1 = --exec-prefix=/usr 321 #CONF_ARGS1 = --exec-prefix=/usr
322 #CONF_ARGS2 = --with-vim-name=vim8 --with-ex-name=ex8 --with-view-name=view8 322 #CONF_ARGS2 = --with-vim-name=vim8 --with-ex-name=ex8 --with-view-name=view8
323 #CONF_ARGS3 = --with-global-runtime=/etc/vim,/usr/share/vim 323 #CONF_ARGS3 = --with-global-runtime=/etc/vim,/usr/share/vim
324 #CONF_ARGS4 = --with-local-dir=/usr/share 324 #CONF_ARGS4 = --with-local-dir=/usr/share
325 #CONF_ARGS5 = --without-local-dir 325 #CONF_ARGS5 = --without-local-dir
326 CONF_ARGS = $(CONF_ARGS1) $(CONF_ARGS2) $(CONF_ARGS3) $(CONF_ARGS4) $(CONF_ARGS5)
327 326
328 # Use this one if you distribute a modified version of Vim. 327 # Use this one if you distribute a modified version of Vim.
329 #CONF_ARGS = --with-modified-by="John Doe" 328 #CONF_ARGS6 = --with-modified-by="John Doe"
330 329
331 # GUI - For creating Vim with GUI (gvim) (B) 330 # GUI - For creating Vim with GUI (gvim) (B)
332 # Uncomment this line when you don't want to get the GUI version, although you 331 # Uncomment this line when you don't want to get the GUI version, although you
333 # have GTK, Motif and/or Athena. Also use --without-x if you don't want X11 332 # have GTK, Motif and/or Athena. Also use --without-x if you don't want X11
334 # at all. 333 # at all.
1931 $(CONF_OPT_CSCOPE) $(CONF_OPT_MULTIBYTE) $(CONF_OPT_INPUT) \ 1930 $(CONF_OPT_CSCOPE) $(CONF_OPT_MULTIBYTE) $(CONF_OPT_INPUT) \
1932 $(CONF_OPT_OUTPUT) $(CONF_OPT_GPM) $(CONF_OPT_WORKSHOP) \ 1931 $(CONF_OPT_OUTPUT) $(CONF_OPT_GPM) $(CONF_OPT_WORKSHOP) \
1933 $(CONF_OPT_FEAT) $(CONF_TERM_LIB) \ 1932 $(CONF_OPT_FEAT) $(CONF_TERM_LIB) \
1934 $(CONF_OPT_COMPBY) $(CONF_OPT_ACL) $(CONF_OPT_NETBEANS) \ 1933 $(CONF_OPT_COMPBY) $(CONF_OPT_ACL) $(CONF_OPT_NETBEANS) \
1935 $(CONF_OPT_CHANNEL) $(CONF_OPT_TERMINAL) \ 1934 $(CONF_OPT_CHANNEL) $(CONF_OPT_TERMINAL) \
1936 $(CONF_ARGS) $(CONF_OPT_MZSCHEME) $(CONF_OPT_PLTHOME) \ 1935 $(CONF_ARGS1) $(CONF_ARGS2) $(CONF_ARGS3) $(CONF_ARGS4) \
1936 $(CONF_ARGS5) $(CONF_ARGS6) \
1937 $(CONF_OPT_MZSCHEME) $(CONF_OPT_PLTHOME) \
1937 $(CONF_OPT_LUA) $(CONF_OPT_LUA_PREFIX) \ 1938 $(CONF_OPT_LUA) $(CONF_OPT_LUA_PREFIX) \
1938 $(CONF_OPT_SYSMOUSE); \ 1939 $(CONF_OPT_SYSMOUSE); \
1939 fi 1940 fi
1940 1941
1941 # Use "make reconfig" to rerun configure without cached values. 1942 # Use "make reconfig" to rerun configure without cached values.