Mercurial > vim
diff src/Makefile @ 16473:a474f2cd3448 v8.1.1240
patch 8.1.1240: runtime desktop files are overwritten by build
commit https://github.com/vim/vim/commit/d96dbd6f95ea22f609042cc9c6272f14a21ff1a5
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Apr 30 21:27:34 2019 +0200
patch 8.1.1240: runtime desktop files are overwritten by build
Problem: Runtime desktop files are overwritten by build. (Tony Mechelynck)
Solution: Instead of copying the files find them with "make install".
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Tue, 30 Apr 2019 21:30:06 +0200 |
| parents | 9bb2192a7c95 |
| children | 854fb0ad4be6 |
line wrap: on
line diff
--- a/src/Makefile +++ b/src/Makefile @@ -2556,9 +2556,14 @@ install-icons: $(INSTALL_DATA) $(SCRIPTSOURCE)/vim16x16.png $(ICON16PATH)/gvim.png; \ fi if test -d $(DESKTOPPATH) -a -w $(DESKTOPPATH); then \ - $(INSTALL_DATA) $(SCRIPTSOURCE)/vim.desktop \ - $(SCRIPTSOURCE)/gvim.desktop \ - $(DESKTOPPATH); \ + if test -f po/vim.desktop -a -f po/gvim.desktop; then \ + $(INSTALL_DATA) po/vim.desktop po/gvim.desktop \ + $(DESKTOPPATH); \ + else \ + $(INSTALL_DATA) $(SCRIPTSOURCE)/vim.desktop \ + $(SCRIPTSOURCE)/gvim.desktop \ + $(DESKTOPPATH); \ + fi; \ if test -z "$(DESTDIR)" -a -x "$(UPDATE_DESKTOP_DATABASE)"; then \ $(UPDATE_DESKTOP_DATABASE) -q $(DESKTOPPATH); \ fi \