updated for version 7.4.217

Problem:    When src/auto/configure was updated, "make clean" would run
            configure pointlessly.
Solution:   Do not run configure for "make clean" and "make distclean" when
            the make program supports $MAKECMDGOALS. (Ken Takata)

diff --git a/src/Makefile b/src/Makefile
index 6b006f565e12249e8ba07fd9292fdc63d3f932b4..4e9b5f14c23ccb52be4b68ab6c4560c3439add12 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -546,6 +546,7 @@ CClink = $(CC)
 # again.
 #CC = cc
 #CC = gcc
+#CC = clang
 
 # COMPILER FLAGS - change as you please. Either before running {{{1
 # configure or afterwards. For examples see below.
@@ -1666,7 +1667,8 @@ 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
-       GUI_INC_LOC="$(GUI_INC_LOC)" GUI_LIB_LOC="$(GUI_LIB_LOC)" \
+       if test "X$(MAKECMDGOALS)" != "Xclean" -a "X$(MAKECMDGOALS)" != "Xdistclean"; 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)" \
                ./configure $(CONF_OPT_GUI) $(CONF_OPT_X) $(CONF_OPT_XSMP) \
@@ -1679,7 +1681,8 @@ config auto/config.mk: auto/configure config.mk.in config.h.in
                $(CONF_OPT_COMPBY) $(CONF_OPT_ACL)  $(CONF_OPT_NETBEANS) \
                $(CONF_ARGS) $(CONF_OPT_MZSCHEME) $(CONF_OPT_PLTHOME) \
                $(CONF_OPT_LUA) $(CONF_OPT_LUA_PREFIX) \
-               $(CONF_OPT_SYSMOUSE)
+               $(CONF_OPT_SYSMOUSE); \
+       fi
 
 # Use "make reconfig" to rerun configure without cached values.
 # When config.h changes, most things will be recompiled automatically.

diff --git a/src/version.c b/src/version.c
index 65c25fe52cea287f7bd87c2557bfb6dabc5bf94d..ce4659c6af907d8807a3943e2df1d85369aee42e 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    217,
 /**/
     216,
 /**/