]> granicus.if.org Git - vim/commitdiff
updated for version 7.4.273 v7.4.273
authorBram Moolenaar <Bram@vim.org>
Tue, 29 Apr 2014 18:04:09 +0000 (20:04 +0200)
committerBram Moolenaar <Bram@vim.org>
Tue, 29 Apr 2014 18:04:09 +0000 (20:04 +0200)
Problem:    "make autoconf" and "make reconfig" may first run configure and
            then remove the output.
Solution:   Add these targets to the exceptions. (Ken Takata)

src/Makefile
src/version.c

index 223fdc0dc4f94277620fdf471819f533268fe8fb..b77b7e8ae0d1457a6ff0b173f875d5ebda852c93 100644 (file)
@@ -1670,7 +1670,10 @@ config auto/config.mk: auto/configure config.mk.in config.h.in
            ! 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" -a "X$(MAKECMDGOALS)" != "Xdistclean"; then \
+       if test "X$(MAKECMDGOALS)" != "Xclean" \
+               -a "X$(MAKECMDGOALS)" != "Xdistclean" \
+               -a "X$(MAKECMDGOALS)" != "Xautoconf" \
+               -a "X$(MAKECMDGOALS)" != "Xreconfig"; then \
            GUI_INC_LOC="$(GUI_INC_LOC)" GUI_LIB_LOC="$(GUI_LIB_LOC)" \
                CC="$(CC)" CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" \
                LDFLAGS="$(LDFLAGS)" $(CONF_SHELL) srcdir="$(srcdir)" \
index 06b949453bc67bd3523ce5fb6acc2019d3823936..3b8fb52613547a7329d2673612c67ea5f72f5fbd 100644 (file)
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    273,
 /**/
     272,
 /**/