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".

diff --git a/src/Makefile b/src/Makefile
index 656c5eef5c1fac6ea49a5ae60aeb48ee57431bff..19b59c2908dc08d3a873bdc09684d75b12468428 100644 (file)
--- 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 693b55ed4bda316210e148bdf72ea75157fd4494..7c03fe4a748dc66febee50e27f6bbeea38529b21 100644 (file)
--- 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 29a1f031e1aa1589b964c21b4d6a75576dca0693..5c6e50648a1e198873420db53b83f208e10fb56d 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -767,6 +767,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1240,
 /**/
     1239,
 /**/