From fba2424cf2f59c0aaa870e767864f35b500bcfd8 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Fri, 12 Jul 2013 20:16:58 +0200 Subject: [PATCH] updated for version 7.4a.012 Problem: "make test" fails when using a shadow directory. Solution: Create links for files in src/po. (James McCoy) --- src/Makefile | 4 +++- src/version.c | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Makefile b/src/Makefile index d3836f595..4df8f8321 100644 --- a/src/Makefile +++ b/src/Makefile @@ -2344,9 +2344,11 @@ SHADOWDIR = shadow shadow: runtime pixmaps mkdir $(SHADOWDIR) - cd $(SHADOWDIR); ln -s ../*.[ch] ../*.in ../*.sh ../*.xs ../*.xbm ../toolcheck ../proto ../po ../vimtutor ../gvimtutor ../mkinstalldirs . + cd $(SHADOWDIR); ln -s ../*.[ch] ../*.in ../*.sh ../*.xs ../*.xbm ../toolcheck ../proto ../vimtutor ../gvimtutor ../mkinstalldirs . mkdir $(SHADOWDIR)/auto cd $(SHADOWDIR)/auto; ln -s ../../auto/configure . + mkdir $(SHADOWDIR)/po + cd $(SHADOWDIR)/po; ln -s ../../po/*.po ../../po/*.mak ../../po/*.vim ../../po/Makefile . cd $(SHADOWDIR); rm -f auto/link.sed cp Makefile configure $(SHADOWDIR) rm -f $(SHADOWDIR)/auto/config.mk $(SHADOWDIR)/config.mk.dist diff --git a/src/version.c b/src/version.c index 676245d7b..bf7c0e194 100644 --- a/src/version.c +++ b/src/version.c @@ -727,6 +727,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 12, /**/ 11, /**/ -- 2.50.1