Mercurial > vim

comparison src/Makefile @ 14758:084e7e74846b v8.1.0391

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.0391: building in a shadow directory fails commit https://github.com/vim/vim/commit/ac49f61a206217e94438b7b51bbfcae79b8a2a19 Author: Bram Moolenaar <Bram@vim.org> 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)
author Christian Brabandt <cb@256bit.org>
date Sat, 15 Sep 2018 15:15:05 +0200
parents 485487e34784
children 6cfd3d47f1ca
comparison
equal deleted inserted replaced
14757:2a2dfe6df1a3 14758:084e7e74846b
2763 # features. 2763 # features.
2764 SHADOWDIR = shadow 2764 SHADOWDIR = shadow
2765 2765
2766 shadow: runtime pixmaps 2766 shadow: runtime pixmaps
2767 $(MKDIR_P) $(SHADOWDIR) 2767 $(MKDIR_P) $(SHADOWDIR)
2768 cd $(SHADOWDIR); ln -s ../*.[chm] ../*.in ../*.sh ../*.xs ../*.xbm ../gui_gtk_res.xml ../toolcheck ../proto ../xdiff ../libvterm ../vimtutor ../gvimtutor ../install-sh ../Make_all.mak . 2768 cd $(SHADOWDIR); ln -s ../*.[chm] ../*.in ../*.sh ../*.xs ../*.xbm ../gui_gtk_res.xml ../toolcheck ../proto ../libvterm ../vimtutor ../gvimtutor ../install-sh ../Make_all.mak .
2769 mkdir $(SHADOWDIR)/auto 2769 mkdir $(SHADOWDIR)/auto
2770 cd $(SHADOWDIR)/auto; ln -s ../../auto/configure . 2770 cd $(SHADOWDIR)/auto; ln -s ../../auto/configure .
2771 $(MKDIR_P) $(SHADOWDIR)/po 2771 $(MKDIR_P) $(SHADOWDIR)/po
2772 cd $(SHADOWDIR)/po; ln -s ../../po/*.po ../../po/*.mak ../../po/*.vim ../../po/Makefile . 2772 cd $(SHADOWDIR)/po; ln -s ../../po/*.po ../../po/*.mak ../../po/*.vim ../../po/Makefile .
2773 cd $(SHADOWDIR); rm -f auto/link.sed 2773 cd $(SHADOWDIR); rm -f auto/link.sed
2775 rm -f $(SHADOWDIR)/auto/config.mk $(SHADOWDIR)/config.mk.dist 2775 rm -f $(SHADOWDIR)/auto/config.mk $(SHADOWDIR)/config.mk.dist
2776 cp config.mk.dist $(SHADOWDIR)/auto/config.mk 2776 cp config.mk.dist $(SHADOWDIR)/auto/config.mk
2777 cp config.mk.dist $(SHADOWDIR) 2777 cp config.mk.dist $(SHADOWDIR)
2778 $(MKDIR_P) $(SHADOWDIR)/xxd 2778 $(MKDIR_P) $(SHADOWDIR)/xxd
2779 cd $(SHADOWDIR)/xxd; ln -s ../../xxd/*.[ch] ../../xxd/Make* . 2779 cd $(SHADOWDIR)/xxd; ln -s ../../xxd/*.[ch] ../../xxd/Make* .
2780 $(MKDIR_P) $(SHADOWDIR)/xdiff
2781 cd $(SHADOWDIR)/xdiff; ln -s ../../xdiff/*.[ch] .
2780 if test -d $(RSRC_DIR); then \ 2782 if test -d $(RSRC_DIR); then \
2781 cd $(SHADOWDIR); \ 2783 cd $(SHADOWDIR); \
2782 ln -s ../infplist.xml .; \ 2784 ln -s ../infplist.xml .; \
2783 ln -s ../$(RSRC_DIR) ../os_mac.rsr.hqx ../dehqx.py .; \ 2785 ln -s ../$(RSRC_DIR) ../os_mac.rsr.hqx ../dehqx.py .; \
2784 fi 2786 fi