To: [email protected]
Subject: Patch 7.4a.012
Fcc: outbox
From: Bram Moolenaar <[email protected]>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.4a.012
Problem:    "make test" fails when using a shadow directory.
Solution:   Create links for files in src/po. (James McCoy)
Files:      src/Makefile


*** ../vim-7.4a.011/src/Makefile        2013-07-09 14:58:06.000000000 +0200
--- src/Makefile        2013-07-12 20:13:30.000000000 +0200
***************
*** 2344,2352 ****

 shadow:       runtime pixmaps
       mkdir $(SHADOWDIR)
!       cd $(SHADOWDIR); ln -s ../*.[ch] ../*.in ../*.sh ../*.xs ../*.xbm ../toolcheck ../proto ../po ../vimtutor ../gvimtutor ../mkinstalldirs .
       mkdir $(SHADOWDIR)/auto
       cd $(SHADOWDIR)/auto; ln -s ../../auto/configure .
       cd $(SHADOWDIR); rm -f auto/link.sed
       cp Makefile configure $(SHADOWDIR)
       rm -f $(SHADOWDIR)/auto/config.mk $(SHADOWDIR)/config.mk.dist
--- 2344,2354 ----

 shadow:       runtime pixmaps
       mkdir $(SHADOWDIR)
!       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
*** ../vim-7.4a.011/src/version.c       2013-07-12 20:07:17.000000000 +0200
--- src/version.c       2013-07-12 20:15:41.000000000 +0200
***************
*** 729,730 ****
--- 729,732 ----
 {   /* Add new patch number below this line */
+ /**/
+     12,
 /**/

--
Computers make very fast, very accurate, mistakes.

/// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
\\\            help me help AIDS victims -- http://ICCF-Holland.org    ///