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 | |
| parent | a9dd2d3c759c1eafb9c0572c5707852ed3d38162 (diff) | |
| download | vim-git-d96dbd6f95ea22f609042cc9c6272f14a21ff1a5.tar.gz | |
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".
| -rw-r--r-- | src/Makefile | 11 | ||||
| -rw-r--r-- | src/po/Makefile | 1 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/src/Makefile b/src/Makefile index 656c5eef5..19b59c290 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 \ diff --git a/src/po/Makefile b/src/po/Makefile index 693b55ed4..7c03fe4a7 100644 --- a/src/po/Makefile +++ b/src/po/Makefile @@ -168,7 +168,6 @@ $(PACKAGE).pot: ../*.c ../if_perl.xs ../GvimExt/gvimext.cpp ../globals.h ../if_p %.desktop: %.desktop.in $(POFILES) @echo $(LANGUAGES) | tr " " "\n" |sed -e '/\./d' | sort > LINGUAS $(MSGFMT) --desktop -d . --template $< -o $@ - cp -f $@ ../../runtime/$@ update-po: $(LANGUAGES) diff --git a/src/version.c b/src/version.c index 29a1f031e..5c6e50648 100644 --- a/src/version.c +++ b/src/version.c @@ -768,6 +768,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1240, +/**/ 1239, /**/ 1238, |