diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-09-15 15:08:52 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-09-15 15:08:52 +0200 |
| commit | ac49f61a206217e94438b7b51bbfcae79b8a2a19 (patch) | |
| tree | bed71e15c1256f70e3009067ee04c6451b360548 | |
| parent | ab18673731522c18696b9b132d3841646904e1bd (diff) | |
| download | vim-git-ac49f61a206217e94438b7b51bbfcae79b8a2a19.tar.gz | |
patch 8.1.0391: building in a shadow directory failsv8.1.0391
Problem: Building in a shadow directory fails.
Solution: Don't link the xdiff directory but what's in it. (closes #3428)
| -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 b0747c8b7..9c19281d8 100644 --- a/src/Makefile +++ b/src/Makefile @@ -2765,7 +2765,7 @@ SHADOWDIR = shadow shadow: runtime pixmaps $(MKDIR_P) $(SHADOWDIR) - cd $(SHADOWDIR); ln -s ../*.[chm] ../*.in ../*.sh ../*.xs ../*.xbm ../gui_gtk_res.xml ../toolcheck ../proto ../xdiff ../libvterm ../vimtutor ../gvimtutor ../install-sh ../Make_all.mak . + cd $(SHADOWDIR); ln -s ../*.[chm] ../*.in ../*.sh ../*.xs ../*.xbm ../gui_gtk_res.xml ../toolcheck ../proto ../libvterm ../vimtutor ../gvimtutor ../install-sh ../Make_all.mak . mkdir $(SHADOWDIR)/auto cd $(SHADOWDIR)/auto; ln -s ../../auto/configure . $(MKDIR_P) $(SHADOWDIR)/po @@ -2777,6 +2777,8 @@ shadow: runtime pixmaps cp config.mk.dist $(SHADOWDIR) $(MKDIR_P) $(SHADOWDIR)/xxd cd $(SHADOWDIR)/xxd; ln -s ../../xxd/*.[ch] ../../xxd/Make* . + $(MKDIR_P) $(SHADOWDIR)/xdiff + cd $(SHADOWDIR)/xdiff; ln -s ../../xdiff/*.[ch] . if test -d $(RSRC_DIR); then \ cd $(SHADOWDIR); \ ln -s ../infplist.xml .; \ diff --git a/src/version.c b/src/version.c index f9e9cf495..3a2b065bc 100644 --- a/src/version.c +++ b/src/version.c @@ -795,6 +795,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 391, +/**/ 390, /**/ 389, |