aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-04 23:07:33 -04:00
Code

patch 8.1.0391: building in a shadow directory fails

Browse Source 
Problem:    Building in a shadow directory fails.
Solution:   Don't link the xdiff directory but what's in it. (closes #3428)
This commit is contained in:
Bram Moolenaar 2018-09-15 15:08:52 +02:00
parent ab18673731
commit ac49f61a20
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Makefile
View File

@ -2765,7 +2765,7 @@ SHADOWDIR = shadow
shadow: runtime pixmaps shadow: runtime pixmaps
$(MKDIR_P) $(SHADOWDIR) $(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 mkdir $(SHADOWDIR)/auto
cd $(SHADOWDIR)/auto; ln -s ../../auto/configure . cd $(SHADOWDIR)/auto; ln -s ../../auto/configure .
$(MKDIR_P) $(SHADOWDIR)/po $(MKDIR_P) $(SHADOWDIR)/po
@ -2777,6 +2777,8 @@ shadow: runtime pixmaps
cp config.mk.dist $(SHADOWDIR) cp config.mk.dist $(SHADOWDIR)
$(MKDIR_P) $(SHADOWDIR)/xxd $(MKDIR_P) $(SHADOWDIR)/xxd
cd $(SHADOWDIR)/xxd; ln -s ../../xxd/*.[ch] ../../xxd/Make* . 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 \ if test -d $(RSRC_DIR); then \
cd $(SHADOWDIR); \ cd $(SHADOWDIR); \
ln -s ../infplist.xml .; \ ln -s ../infplist.xml .; \

2
src/version.c
View File

@ -794,6 +794,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
391,
/**/ /**/
390, 390,
/**/ /**/