diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-04-21 18:20:11 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-04-21 18:20:11 +0200 |
| commit | 4adfaabfe7e07da9546b45130cad0d266ba48611 (patch) | |
| tree | 2902951bbe4ab52530507f13df36c94ce9cd4bb6 /src/Makefile | |
| parent | 0c1ff16b5467f97ce08134fdbc8198127bbe492a (diff) | |
| download | vim-git-4adfaabfe7e07da9546b45130cad0d266ba48611.tar.gz | |
patch 7.4.1767v7.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)
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/src/Makefile b/src/Makefile index 195cbd5c6..69e3a4b9f 100644 --- 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) $(DEST_KMAP) 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): |