Mercurial > vim

diff src/Makefile @ 8963:53e53aeb35ad v7.4.1767

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/4adfaabfe7e07da9546b45130cad0d266ba48611 Author: Bram Moolenaar <Bram@vim.org> Date: Thu Apr 21 18:20:11 2016 +0200 patch 7.4.1767 Problem: When installing Vim on a GTK system the icon cache is not updated. Solution: Update the GTK icon cache when possible. (Kazunobu Kuriyama)
author Christian Brabandt <cb@256bit.org>
date Thu, 21 Apr 2016 18:30:07 +0200
parents d5d2e48666bd
children 887bded0d8ea
line wrap: on
line diff
--- a/src/Makefile
+++ b/src/Makefile
@@ -1977,7 +1977,6 @@ test1 \
 	test_listlbr_utf8 \
 	test_mapping \
 	test_marks \
-	test_match_conceal \
 	test_nested_function \
 	test_options \
 	test_ruby \
@@ -2013,11 +2012,14 @@ test_arglist \
 	test_delete \
 	test_ex_undo \
 	test_expand \
+	test_expand_dllpath \
 	test_expr \
+	test_expr_utf8 \
 	test_feedkeys \
 	test_file_perm \
 	test_fnamemodify \
 	test_glob2regpat \
+	test_goto \
 	test_hardcopy \
 	test_help_tagjump \
 	test_history \
@@ -2026,8 +2028,11 @@ test_arglist \
 	test_json \
 	test_langmap \
 	test_lispwords \
+	test_matchadd_conceal \
+	test_matchadd_conceal_utf8 \
 	test_matchstrpos \
 	test_menu \
+	test_messages \
 	test_packadd \
 	test_partial \
 	test_perl \
@@ -2042,6 +2047,7 @@ test_arglist \
 	test_syn_attr \
 	test_syntax \
 	test_tabline \
+	test_tagjump \
 	test_timers \
 	test_undolevels \
 	test_unlet \
@@ -2350,12 +2356,18 @@ install-languages: languages $(DEST_LANG
 ICON48PATH = $(DESTDIR)$(DATADIR)/icons/hicolor/48x48/apps
 ICON32PATH = $(DESTDIR)$(DATADIR)/icons/locolor/32x32/apps
 ICON16PATH = $(DESTDIR)$(DATADIR)/icons/locolor/16x16/apps
+ICONTHEMEPATH = $(DATADIR)/icons/hicolor
 DESKTOPPATH = $(DESTDIR)$(DATADIR)/applications
 KDEPATH = $(HOME)/.kde/share/icons
 install-icons:
 	if test -d $(ICON48PATH) -a -w $(ICON48PATH) \
 		-a ! -f $(ICON48PATH)/gvim.png; then \
 	   $(INSTALL_DATA) $(SCRIPTSOURCE)/vim48x48.png $(ICON48PATH)/gvim.png; \
+	   if test -z "$(DESTDIR)" -a -x $(GTK_UPDATE_ICON_CACHE) \
+		   -a -w $(ICONTHEMEPATH) \
+		   -a -f $(ICONTHEMEPATH)/index.theme; then \
+		$(GTK_UPDATE_ICON_CACHE) -q $(ICONTHEMEPATH); \
+	   fi \
 	fi
 	if test -d $(ICON32PATH) -a -w $(ICON32PATH) \
 		-a ! -f $(ICON32PATH)/gvim.png; then \
@@ -2369,6 +2381,9 @@ install-icons:
 	   $(INSTALL_DATA) $(SCRIPTSOURCE)/vim.desktop \
 		$(SCRIPTSOURCE)/gvim.desktop \
 		$(DESKTOPPATH); \
+	   if test -z "$(DESTDIR)" -a -x $(UPDATE_DESKTOP_DATABASE); then \
+	      $(UPDATE_DESKTOP_DATABASE) -q $(DESKTOPPATH); \
+	   fi \
 	fi
 
 $(HELPSOURCE)/vim.1 $(MACROSOURCE) $(TOOLSSOURCE):