# HG changeset patch # User Christian Brabandt # Date 1537017305 -7200 # Node ID 084e7e74846b7904ac5080eefd87b872bcf58288 # Parent 2a2dfe6df1a342958de61033e3b0d20318d34ef8 patch 8.1.0391: building in a shadow directory fails commit https://github.com/vim/vim/commit/ac49f61a206217e94438b7b51bbfcae79b8a2a19 Author: Bram Moolenaar Date: Sat Sep 15 15:08:52 2018 +0200 patch 8.1.0391: building in a shadow directory fails Problem: Building in a shadow directory fails. Solution: Don't link the xdiff directory but what's in it. (closes https://github.com/vim/vim/issues/3428) diff --git a/src/Makefile b/src/Makefile --- 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 --- 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,