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)

diff --git a/src/Makefile b/src/Makefile
index d3836f595c738e8b7338b993a541b72316e2a38f..4df8f83212cec1f477b058da9f28bacc594763fa 100644 (file)
--- 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 676245d7b1c51c4b30bc5dc899cc4df3fcc62be7..bf7c0e1949d35d752a15f81f2da52afddba343f6 100644 (file)
--- 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,
 /**/