aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

updated for version 7.4.300

Browse Source 
Problem:    The way config.cache is removed doesn't always work.
Solution:   Always remove config.cache. (Ken Takata)
This commit is contained in:
Bram Moolenaar
2014-05-22 14:54:26 +02:00
parent cf1b057939
commit 7b129a5ac4
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Makefile
View File

@@ -1664,12 +1664,11 @@ tools: $(TOOLS)
# auto/config.h isn't updated. The dependency on auto/config.mk should make # auto/config.h isn't updated. The dependency on auto/config.mk should make
# sure configure is run when it's needed. # sure configure is run when it's needed.
# #
# Remove the config.cache every time, once in a while it causes problems that
# are very hard to figure out.
#
config auto/config.mk: auto/configure config.mk.in config.h.in config auto/config.mk: auto/configure config.mk.in config.h.in
if test -f auto/config.cache && \ -rm -f auto/config.cache
grep '^ac_cv_env_CFLAGS_value=' auto/config.cache > /dev/null && \
! grep -x -F 'ac_cv_env_CFLAGS_value=$(CFLAGS)' auto/config.cache > /dev/null; then \
rm auto/config.cache; \
fi
if test "X$(MAKECMDGOALS)" != "Xclean" \ if test "X$(MAKECMDGOALS)" != "Xclean" \
-a "X$(MAKECMDGOALS)" != "Xdistclean" \ -a "X$(MAKECMDGOALS)" != "Xdistclean" \
-a "X$(MAKECMDGOALS)" != "Xautoconf" \ -a "X$(MAKECMDGOALS)" != "Xautoconf" \

2
src/version.c
View File

@@ -734,6 +734,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
300,
/**/ /**/
299, 299,
/**/ /**/