Mercurial > vim
comparison src/Makefile @ 8893:d5d2e48666bd v7.4.1733
commit https://github.com/vim/vim/commit/839e954aaa72ef62f65416d177f829e681c15466
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Apr 14 16:46:02 2016 +0200
patch 7.4.1733
Problem: "make install" doesn't know about cross-compiling. (Christian
Neukirchen)
Solution: Add CROSS_COMPILING. (closes https://github.com/vim/vim/issues/740)
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Thu, 14 Apr 2016 17:00:05 +0200 |
parents | 9380c37723f8 |
children | 53e53aeb35ad |
comparison
equal
deleted
inserted
replaced
8892:dbbbb98186f1 | 8893:d5d2e48666bd |
---|---|
1996 test50 test51 test52 test53 test54 test55 test56 test57 test58 test59 \ | 1996 test50 test51 test52 test53 test54 test55 test56 test57 test58 test59 \ |
1997 test60 test61 test62 test63 test64 test65 test66 test67 test68 test69 \ | 1997 test60 test61 test62 test63 test64 test65 test66 test67 test68 test69 \ |
1998 test70 test71 test72 test73 test74 test75 test76 test77 test78 test79 \ | 1998 test70 test71 test72 test73 test74 test75 test76 test77 test78 test79 \ |
1999 test80 test81 test82 test83 test84 test85 test86 test87 test88 test89 \ | 1999 test80 test81 test82 test83 test84 test85 test86 test87 test88 test89 \ |
2000 test90 test91 test92 test93 test94 test95 test97 test98 test99 \ | 2000 test90 test91 test92 test93 test94 test95 test97 test98 test99 \ |
2001 test100 test101 test102 test103 test104 test105 test107 test108: | 2001 test100 test101 test102 test103 test104 test107 test108: |
2002 cd testdir; rm -f $@.out; $(MAKE) -f Makefile $@.out VIMPROG=../$(VIMTARGET) $(GUI_TESTARG) SCRIPTSOURCE=../$(SCRIPTSOURCE) | 2002 cd testdir; rm -f $@.out; $(MAKE) -f Makefile $@.out VIMPROG=../$(VIMTARGET) $(GUI_TESTARG) SCRIPTSOURCE=../$(SCRIPTSOURCE) |
2003 | 2003 |
2004 # Run individual NEW style test, assuming that Vim was already compiled. | 2004 # Run individual NEW style test, assuming that Vim was already compiled. |
2005 test_arglist \ | 2005 test_arglist \ |
2006 test_assert \ | 2006 test_assert \ |
2007 test_assign \ | 2007 test_assign \ |
2008 test_autocmd \ | |
2008 test_backspace_opt \ | 2009 test_backspace_opt \ |
2009 test_cdo \ | 2010 test_cdo \ |
2010 test_channel \ | 2011 test_channel \ |
2011 test_cursor_func \ | 2012 test_cursor_func \ |
2012 test_delete \ | 2013 test_delete \ |
2013 test_ex_undo \ | 2014 test_ex_undo \ |
2015 test_expand \ | |
2014 test_expr \ | 2016 test_expr \ |
2015 test_expand \ | |
2016 test_feedkeys \ | 2017 test_feedkeys \ |
2017 test_file_perm \ | 2018 test_file_perm \ |
2019 test_fnamemodify \ | |
2018 test_glob2regpat \ | 2020 test_glob2regpat \ |
2019 test_hardcopy \ | 2021 test_hardcopy \ |
2020 test_help_tagjump \ | 2022 test_help_tagjump \ |
2021 test_history \ | 2023 test_history \ |
2022 test_increment \ | 2024 test_increment \ |
2023 test_join \ | 2025 test_join \ |
2024 test_json \ | 2026 test_json \ |
2025 test_langmap \ | 2027 test_langmap \ |
2026 test_lispwords \ | 2028 test_lispwords \ |
2029 test_matchstrpos \ | |
2027 test_menu \ | 2030 test_menu \ |
2028 test_packadd \ | 2031 test_packadd \ |
2029 test_partial \ | 2032 test_partial \ |
2030 test_perl \ | 2033 test_perl \ |
2031 test_quickfix \ | 2034 test_quickfix \ |
2035 test_regexp_latin \ | |
2036 test_regexp_utf8 \ | |
2032 test_reltime \ | 2037 test_reltime \ |
2033 test_searchpos \ | 2038 test_searchpos \ |
2034 test_set \ | 2039 test_set \ |
2035 test_sort \ | 2040 test_sort \ |
2041 test_statusline \ | |
2036 test_syn_attr \ | 2042 test_syn_attr \ |
2037 test_syntax \ | 2043 test_syntax \ |
2044 test_tabline \ | |
2038 test_timers \ | 2045 test_timers \ |
2039 test_undolevels \ | 2046 test_undolevels \ |
2040 test_unlet \ | 2047 test_unlet \ |
2041 test_viminfo \ | 2048 test_viminfo \ |
2042 test_viml \ | 2049 test_viml \ |
2043 test_visual \ | 2050 test_visual \ |
2044 test_window_id \ | 2051 test_window_id \ |
2052 test_alot_latin \ | |
2053 test_alot_utf8 \ | |
2045 test_alot: | 2054 test_alot: |
2046 cd testdir; rm -f $@.res test.log messages; $(MAKE) -f Makefile $@.res VIMPROG=../$(VIMTARGET) $(GUI_TESTARG) SCRIPTSOURCE=../$(SCRIPTSOURCE) | 2055 cd testdir; rm -f $@.res test.log messages; $(MAKE) -f Makefile $@.res VIMPROG=../$(VIMTARGET) $(GUI_TESTARG) SCRIPTSOURCE=../$(SCRIPTSOURCE) |
2047 @if test -f testdir/test.log; then \ | 2056 @if test -f testdir/test.log; then \ |
2048 cat testdir/test.log; \ | 2057 cat testdir/test.log; \ |
2049 fi | 2058 fi |
2124 $(DEST_TUTOR) $(DEST_SPELL) $(DEST_COMP) | 2133 $(DEST_TUTOR) $(DEST_SPELL) $(DEST_COMP) |
2125 -$(SHELL) ./installman.sh install $(DEST_MAN) "" $(INSTALLMANARGS) | 2134 -$(SHELL) ./installman.sh install $(DEST_MAN) "" $(INSTALLMANARGS) |
2126 # Generate the help tags with ":helptags" to handle all languages. | 2135 # Generate the help tags with ":helptags" to handle all languages. |
2127 # Move the distributed tags file aside and restore it, to avoid it being | 2136 # Move the distributed tags file aside and restore it, to avoid it being |
2128 # different from the repository. | 2137 # different from the repository. |
2129 cd $(HELPSOURCE); if test -f tags; then mv -f tags tags.dist; fi | 2138 cd $(HELPSOURCE); if test -z "$(CROSS_COMPILING)" -a -f tags; then \ |
2139 mv -f tags tags.dist; fi | |
2130 @echo generating help tags | 2140 @echo generating help tags |
2131 -@cd $(HELPSOURCE); $(MAKE) VIMEXE=$(DEST_BIN)/$(VIMTARGET) vimtags | 2141 -@cd $(HELPSOURCE); if test -z "$(CROSS_COMPILING)"; then \ |
2142 $(MAKE) VIMEXE=$(DEST_BIN)/$(VIMTARGET) vimtags; fi | |
2132 cd $(HELPSOURCE); \ | 2143 cd $(HELPSOURCE); \ |
2133 files=`ls *.txt tags`; \ | 2144 files=`ls *.txt tags`; \ |
2134 files="$$files `ls *.??x tags-?? 2>/dev/null || true`"; \ | 2145 files="$$files `ls *.??x tags-?? 2>/dev/null || true`"; \ |
2135 $(INSTALL_DATA) $$files $(DEST_HELP); \ | 2146 $(INSTALL_DATA) $$files $(DEST_HELP); \ |
2136 cd $(DEST_HELP); \ | 2147 cd $(DEST_HELP); \ |