diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-04-30 21:27:34 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-04-30 21:27:34 +0200 |
| commit | d96dbd6f95ea22f609042cc9c6272f14a21ff1a5 (patch) | |
| tree | 1799d6ec1c5623d692c629afdfa143e7b2f93520 /src/Makefile | |
| parent | a9dd2d3c759c1eafb9c0572c5707852ed3d38162 (diff) | |
patch 8.1.1240: runtime desktop files are overwritten by buildv8.1.1240
Problem: Runtime desktop files are overwritten by build. (Tony Mechelynck)
Solution: Instead of copying the files find them with "make install".
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/Makefile b/src/Makefile index 656c5eef5c..19b59c2908 100644 --- 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 \ |