|
|
22c937 |
To: vim_dev@googlegroups.com
|
|
|
22c937 |
Subject: Patch 7.4.300
|
|
|
22c937 |
Fcc: outbox
|
|
|
22c937 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
22c937 |
Mime-Version: 1.0
|
|
|
22c937 |
Content-Type: text/plain; charset=UTF-8
|
|
|
22c937 |
Content-Transfer-Encoding: 8bit
|
|
|
22c937 |
------------
|
|
|
22c937 |
|
|
|
22c937 |
Patch 7.4.300
|
|
|
22c937 |
Problem: The way config.cache is removed doesn't always work.
|
|
|
22c937 |
Solution: Always remove config.cache. (Ken Takata)
|
|
|
22c937 |
Files: src/Makefile
|
|
|
22c937 |
|
|
|
22c937 |
|
|
|
22c937 |
*** ../vim-7.4.299/src/Makefile 2014-04-29 20:04:05.331539784 +0200
|
|
|
22c937 |
--- src/Makefile 2014-05-22 14:48:23.034475967 +0200
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 1664,1675 ****
|
|
|
22c937 |
# auto/config.h isn't updated. The dependency on auto/config.mk should make
|
|
|
22c937 |
# sure configure is run when it's needed.
|
|
|
22c937 |
#
|
|
|
22c937 |
config auto/config.mk: auto/configure config.mk.in config.h.in
|
|
|
22c937 |
! if test -f auto/config.cache && \
|
|
|
22c937 |
! grep '^ac_cv_env_CFLAGS_value=' auto/config.cache > /dev/null && \
|
|
|
22c937 |
! ! grep -x -F 'ac_cv_env_CFLAGS_value=$(CFLAGS)' auto/config.cache > /dev/null; then \
|
|
|
22c937 |
! rm auto/config.cache; \
|
|
|
22c937 |
! fi
|
|
|
22c937 |
if test "X$(MAKECMDGOALS)" != "Xclean" \
|
|
|
22c937 |
-a "X$(MAKECMDGOALS)" != "Xdistclean" \
|
|
|
22c937 |
-a "X$(MAKECMDGOALS)" != "Xautoconf" \
|
|
|
22c937 |
--- 1664,1674 ----
|
|
|
22c937 |
# auto/config.h isn't updated. The dependency on auto/config.mk should make
|
|
|
22c937 |
# sure configure is run when it's needed.
|
|
|
22c937 |
#
|
|
|
22c937 |
+ # Remove the config.cache every time, once in a while it causes problems that
|
|
|
22c937 |
+ # are very hard to figure out.
|
|
|
22c937 |
+ #
|
|
|
22c937 |
config auto/config.mk: auto/configure config.mk.in config.h.in
|
|
|
22c937 |
! -rm -f auto/config.cache
|
|
|
22c937 |
if test "X$(MAKECMDGOALS)" != "Xclean" \
|
|
|
22c937 |
-a "X$(MAKECMDGOALS)" != "Xdistclean" \
|
|
|
22c937 |
-a "X$(MAKECMDGOALS)" != "Xautoconf" \
|
|
|
22c937 |
*** ../vim-7.4.299/src/version.c 2014-05-22 14:44:08.098481148 +0200
|
|
|
22c937 |
--- src/version.c 2014-05-22 14:51:36.022472045 +0200
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 736,737 ****
|
|
|
22c937 |
--- 736,739 ----
|
|
|
22c937 |
{ /* Add new patch number below this line */
|
|
|
22c937 |
+ /**/
|
|
|
22c937 |
+ 300,
|
|
|
22c937 |
/**/
|
|
|
22c937 |
|
|
|
22c937 |
|
|
|
22c937 |
--
|
|
|
22c937 |
What is the difference between a professional and an amateur?
|
|
|
22c937 |
The ark was built by an amateur; professionals gave us the Titanic.
|
|
|
22c937 |
|
|
|
22c937 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
22c937 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
22c937 |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
22c937 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|