From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 28 Mar 2012 15:17:48 +0000 (+0200)
Subject: updated for version 7.3.485
X-Git-Tag: v7.3.485
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=da5a4970a9e143ca5c936d28ad1709edba07d3b0;p=thirdparty%2Fvim.git

updated for version 7.3.485
Problem:    When building Vim LDFLAGS isn't passed on to building xxd.
Solution:   Pass the LDFLAGS value. (James McCoy)
---

diff --git a/src/Makefile b/src/Makefile
index 754739f08d..8197b120d2 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1720,7 +1720,7 @@ $(VIMTARGET): auto/config.mk objects $(OBJ) version.c version.h
 		sh $(srcdir)/link.sh
 
 xxd/xxd$(EXEEXT): xxd/xxd.c
-	cd xxd; CC="$(CC)" CFLAGS="$(CPPFLAGS) $(CFLAGS)" \
+	cd xxd; CC="$(CC)" CFLAGS="$(CPPFLAGS) $(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
 		$(MAKE) -f Makefile
 
 # Build the language specific files if they were unpacked.
diff --git a/src/version.c b/src/version.c
index f9a1391fd6..2009133189 100644
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    485,
 /**/
     484,
 /**/