Mercurial > vim

diff src/Makefile @ 8893:d5d2e48666bd v7.4.1733

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
line wrap: on
line diff
--- a/src/Makefile
+++ b/src/Makefile
@@ -1998,23 +1998,25 @@ test1 \
 	test70 test71 test72 test73 test74 test75 test76 test77 test78 test79 \
 	test80 test81 test82 test83 test84 test85 test86 test87 test88 test89 \
 	test90 test91 test92 test93 test94 test95 test97 test98 test99 \
-	test100 test101 test102 test103 test104 test105 test107 test108:
+	test100 test101 test102 test103 test104 test107 test108:
 	cd testdir; rm -f $@.out; $(MAKE) -f Makefile $@.out VIMPROG=../$(VIMTARGET) $(GUI_TESTARG) SCRIPTSOURCE=../$(SCRIPTSOURCE)
 
 # Run individual NEW style test, assuming that Vim was already compiled.
 test_arglist \
 	test_assert \
 	test_assign \
+	test_autocmd \
 	test_backspace_opt \
 	test_cdo \
 	test_channel \
 	test_cursor_func \
 	test_delete \
 	test_ex_undo \
+	test_expand \
 	test_expr \
-	test_expand \
 	test_feedkeys \
 	test_file_perm \
+	test_fnamemodify \
 	test_glob2regpat \
 	test_hardcopy \
 	test_help_tagjump \
@@ -2024,17 +2026,22 @@ test_arglist \
 	test_json \
 	test_langmap \
 	test_lispwords \
+	test_matchstrpos \
 	test_menu \
 	test_packadd \
 	test_partial \
 	test_perl \
 	test_quickfix \
+	test_regexp_latin \
+	test_regexp_utf8 \
 	test_reltime \
 	test_searchpos \
 	test_set \
 	test_sort \
+	test_statusline \
 	test_syn_attr \
 	test_syntax \
+	test_tabline \
 	test_timers \
 	test_undolevels \
 	test_unlet \
@@ -2042,6 +2049,8 @@ test_arglist \
 	test_viml \
 	test_visual \
 	test_window_id \
+	test_alot_latin \
+	test_alot_utf8 \
 	test_alot:
 	cd testdir; rm -f $@.res test.log messages; $(MAKE) -f Makefile $@.res VIMPROG=../$(VIMTARGET) $(GUI_TESTARG) SCRIPTSOURCE=../$(SCRIPTSOURCE)
 	@if test -f testdir/test.log; then \
@@ -2126,9 +2135,11 @@ installrtbase: $(HELPSOURCE)/vim.1 $(DES
 # Generate the help tags with ":helptags" to handle all languages.
 # Move the distributed tags file aside and restore it, to avoid it being
 # different from the repository.
-	cd $(HELPSOURCE); if test -f tags; then mv -f tags tags.dist; fi
+	cd $(HELPSOURCE); if test -z "$(CROSS_COMPILING)" -a -f tags; then \
+		mv -f tags tags.dist; fi
 	@echo generating help tags
-	-@cd $(HELPSOURCE); $(MAKE) VIMEXE=$(DEST_BIN)/$(VIMTARGET) vimtags
+	-@cd $(HELPSOURCE); if test -z "$(CROSS_COMPILING)"; then \
+		$(MAKE) VIMEXE=$(DEST_BIN)/$(VIMTARGET) vimtags; fi
 	cd $(HELPSOURCE); \
 		files=`ls *.txt tags`; \
 		files="$$files `ls *.??x tags-?? 2>/dev/null || true`"; \