diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-04-29 20:04:09 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-04-29 20:04:09 +0200 |
| commit | b96c69d80e626f1f06ed8646c679968af1a1d923 (patch) | |
| tree | 77b65757ad39723f2c089bb1e9d8de4a5e2ae445 | |
| parent | e512c8c049c2e5768c0ea86531093224e2919955 (diff) | |
| download | vim-git-b96c69d80e626f1f06ed8646c679968af1a1d923.tar.gz | |
updated for version 7.4.273v7.4.273
Problem: "make autoconf" and "make reconfig" may first run configure and
then remove the output.
Solution: Add these targets to the exceptions. (Ken Takata)
| -rw-r--r-- | src/Makefile | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/Makefile b/src/Makefile index 223fdc0dc..b77b7e8ae 100644 --- a/src/Makefile +++ b/src/Makefile @@ -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)" \ diff --git a/src/version.c b/src/version.c index 06b949453..3b8fb5261 100644 --- a/src/version.c +++ b/src/version.c @@ -735,6 +735,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 273, +/**/ 272, /**/ 271, |