diff options
| author | Bram Moolenaar <Bram@vim.org> | 2013-07-12 20:16:58 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2013-07-12 20:16:58 +0200 |
| commit | fba2424cf2f59c0aaa870e767864f35b500bcfd8 (patch) | |
| tree | 7a93b51a72b614709c47eafe72e64854277bfafa /src | |
| parent | fee496d8825b1b5fc345234e18a750fa1cc1a1de (diff) | |
updated for version 7.4a.012v7.4a.012
Problem: "make test" fails when using a shadow directory.
Solution: Create links for files in src/po. (James McCoy)
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/Makefile b/src/Makefile index d3836f595c..4df8f83212 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 676245d7b1..bf7c0e1949 100644 --- a/src/version.c +++ b/src/version.c @@ -728,6 +728,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 12, +/**/ 11, /**/ 10, |