Mercurial > vim
comparison src/Makefile @ 8963:53e53aeb35ad v7.4.1767
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 |
comparison
equal
deleted
inserted
replaced
8962:b4be6f6610a0 | 8963:53e53aeb35ad |
---|---|
1975 test_listchars \ | 1975 test_listchars \ |
1976 test_listlbr \ | 1976 test_listlbr \ |
1977 test_listlbr_utf8 \ | 1977 test_listlbr_utf8 \ |
1978 test_mapping \ | 1978 test_mapping \ |
1979 test_marks \ | 1979 test_marks \ |
1980 test_match_conceal \ | |
1981 test_nested_function \ | 1980 test_nested_function \ |
1982 test_options \ | 1981 test_options \ |
1983 test_ruby \ | 1982 test_ruby \ |
1984 test_search_mbyte \ | 1983 test_search_mbyte \ |
1985 test_signs \ | 1984 test_signs \ |
2011 test_channel \ | 2010 test_channel \ |
2012 test_cursor_func \ | 2011 test_cursor_func \ |
2013 test_delete \ | 2012 test_delete \ |
2014 test_ex_undo \ | 2013 test_ex_undo \ |
2015 test_expand \ | 2014 test_expand \ |
2015 test_expand_dllpath \ | |
2016 test_expr \ | 2016 test_expr \ |
2017 test_expr_utf8 \ | |
2017 test_feedkeys \ | 2018 test_feedkeys \ |
2018 test_file_perm \ | 2019 test_file_perm \ |
2019 test_fnamemodify \ | 2020 test_fnamemodify \ |
2020 test_glob2regpat \ | 2021 test_glob2regpat \ |
2022 test_goto \ | |
2021 test_hardcopy \ | 2023 test_hardcopy \ |
2022 test_help_tagjump \ | 2024 test_help_tagjump \ |
2023 test_history \ | 2025 test_history \ |
2024 test_increment \ | 2026 test_increment \ |
2025 test_join \ | 2027 test_join \ |
2026 test_json \ | 2028 test_json \ |
2027 test_langmap \ | 2029 test_langmap \ |
2028 test_lispwords \ | 2030 test_lispwords \ |
2031 test_matchadd_conceal \ | |
2032 test_matchadd_conceal_utf8 \ | |
2029 test_matchstrpos \ | 2033 test_matchstrpos \ |
2030 test_menu \ | 2034 test_menu \ |
2035 test_messages \ | |
2031 test_packadd \ | 2036 test_packadd \ |
2032 test_partial \ | 2037 test_partial \ |
2033 test_perl \ | 2038 test_perl \ |
2034 test_quickfix \ | 2039 test_quickfix \ |
2035 test_regexp_latin \ | 2040 test_regexp_latin \ |
2040 test_sort \ | 2045 test_sort \ |
2041 test_statusline \ | 2046 test_statusline \ |
2042 test_syn_attr \ | 2047 test_syn_attr \ |
2043 test_syntax \ | 2048 test_syntax \ |
2044 test_tabline \ | 2049 test_tabline \ |
2050 test_tagjump \ | |
2045 test_timers \ | 2051 test_timers \ |
2046 test_undolevels \ | 2052 test_undolevels \ |
2047 test_unlet \ | 2053 test_unlet \ |
2048 test_viminfo \ | 2054 test_viminfo \ |
2049 test_viml \ | 2055 test_viml \ |
2348 | 2354 |
2349 # install the icons for KDE, if the directory exists and the icon doesn't. | 2355 # install the icons for KDE, if the directory exists and the icon doesn't. |
2350 ICON48PATH = $(DESTDIR)$(DATADIR)/icons/hicolor/48x48/apps | 2356 ICON48PATH = $(DESTDIR)$(DATADIR)/icons/hicolor/48x48/apps |
2351 ICON32PATH = $(DESTDIR)$(DATADIR)/icons/locolor/32x32/apps | 2357 ICON32PATH = $(DESTDIR)$(DATADIR)/icons/locolor/32x32/apps |
2352 ICON16PATH = $(DESTDIR)$(DATADIR)/icons/locolor/16x16/apps | 2358 ICON16PATH = $(DESTDIR)$(DATADIR)/icons/locolor/16x16/apps |
2359 ICONTHEMEPATH = $(DATADIR)/icons/hicolor | |
2353 DESKTOPPATH = $(DESTDIR)$(DATADIR)/applications | 2360 DESKTOPPATH = $(DESTDIR)$(DATADIR)/applications |
2354 KDEPATH = $(HOME)/.kde/share/icons | 2361 KDEPATH = $(HOME)/.kde/share/icons |
2355 install-icons: | 2362 install-icons: |
2356 if test -d $(ICON48PATH) -a -w $(ICON48PATH) \ | 2363 if test -d $(ICON48PATH) -a -w $(ICON48PATH) \ |
2357 -a ! -f $(ICON48PATH)/gvim.png; then \ | 2364 -a ! -f $(ICON48PATH)/gvim.png; then \ |
2358 $(INSTALL_DATA) $(SCRIPTSOURCE)/vim48x48.png $(ICON48PATH)/gvim.png; \ | 2365 $(INSTALL_DATA) $(SCRIPTSOURCE)/vim48x48.png $(ICON48PATH)/gvim.png; \ |
2366 if test -z "$(DESTDIR)" -a -x $(GTK_UPDATE_ICON_CACHE) \ | |
2367 -a -w $(ICONTHEMEPATH) \ | |
2368 -a -f $(ICONTHEMEPATH)/index.theme; then \ | |
2369 $(GTK_UPDATE_ICON_CACHE) -q $(ICONTHEMEPATH); \ | |
2370 fi \ | |
2359 fi | 2371 fi |
2360 if test -d $(ICON32PATH) -a -w $(ICON32PATH) \ | 2372 if test -d $(ICON32PATH) -a -w $(ICON32PATH) \ |
2361 -a ! -f $(ICON32PATH)/gvim.png; then \ | 2373 -a ! -f $(ICON32PATH)/gvim.png; then \ |
2362 $(INSTALL_DATA) $(SCRIPTSOURCE)/vim32x32.png $(ICON32PATH)/gvim.png; \ | 2374 $(INSTALL_DATA) $(SCRIPTSOURCE)/vim32x32.png $(ICON32PATH)/gvim.png; \ |
2363 fi | 2375 fi |
2367 fi | 2379 fi |
2368 if test -d $(DESKTOPPATH) -a -w $(DESKTOPPATH); then \ | 2380 if test -d $(DESKTOPPATH) -a -w $(DESKTOPPATH); then \ |
2369 $(INSTALL_DATA) $(SCRIPTSOURCE)/vim.desktop \ | 2381 $(INSTALL_DATA) $(SCRIPTSOURCE)/vim.desktop \ |
2370 $(SCRIPTSOURCE)/gvim.desktop \ | 2382 $(SCRIPTSOURCE)/gvim.desktop \ |
2371 $(DESKTOPPATH); \ | 2383 $(DESKTOPPATH); \ |
2384 if test -z "$(DESTDIR)" -a -x $(UPDATE_DESKTOP_DATABASE); then \ | |
2385 $(UPDATE_DESKTOP_DATABASE) -q $(DESKTOPPATH); \ | |
2386 fi \ | |
2372 fi | 2387 fi |
2373 | 2388 |
2374 $(HELPSOURCE)/vim.1 $(MACROSOURCE) $(TOOLSSOURCE): | 2389 $(HELPSOURCE)/vim.1 $(MACROSOURCE) $(TOOLSSOURCE): |
2375 @echo Runtime files not found. | 2390 @echo Runtime files not found. |
2376 @echo You need to unpack the runtime archive before running "make install". | 2391 @echo You need to unpack the runtime archive before running "make install". |