aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.1.1240: runtime desktop files are overwritten by build

Browse Source 
Problem:    Runtime desktop files are overwritten by build. (Tony Mechelynck)
Solution:   Instead of copying the files find them with "make install".
This commit is contained in:
Bram Moolenaar 2019-04-30 21:27:34 +02:00
parent a9dd2d3c75
commit d96dbd6f95
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Makefile
View File

@ -2556,9 +2556,14 @@ install-icons:
$(INSTALL_DATA) $(SCRIPTSOURCE)/vim16x16.png $(ICON16PATH)/gvim.png; \ $(INSTALL_DATA) $(SCRIPTSOURCE)/vim16x16.png $(ICON16PATH)/gvim.png; \
fi fi
if test -d $(DESKTOPPATH) -a -w $(DESKTOPPATH); then \ if test -d $(DESKTOPPATH) -a -w $(DESKTOPPATH); then \
$(INSTALL_DATA) $(SCRIPTSOURCE)/vim.desktop \ if test -f po/vim.desktop -a -f po/gvim.desktop; then \
$(SCRIPTSOURCE)/gvim.desktop \ $(INSTALL_DATA) po/vim.desktop po/gvim.desktop \
$(DESKTOPPATH); \ $(DESKTOPPATH); \
else \
$(INSTALL_DATA) $(SCRIPTSOURCE)/vim.desktop \
$(SCRIPTSOURCE)/gvim.desktop \
$(DESKTOPPATH); \
fi; \
if test -z "$(DESTDIR)" -a -x "$(UPDATE_DESKTOP_DATABASE)"; then \ if test -z "$(DESTDIR)" -a -x "$(UPDATE_DESKTOP_DATABASE)"; then \
$(UPDATE_DESKTOP_DATABASE) -q $(DESKTOPPATH); \ $(UPDATE_DESKTOP_DATABASE) -q $(DESKTOPPATH); \
fi \ fi \

1
src/po/Makefile
View File

@ -168,7 +168,6 @@ $(PACKAGE).pot: ../*.c ../if_perl.xs ../GvimExt/gvimext.cpp ../globals.h ../if_p
%.desktop: %.desktop.in $(POFILES) %.desktop: %.desktop.in $(POFILES)
@echo $(LANGUAGES) | tr " " "\n" |sed -e '/\./d' | sort > LINGUAS @echo $(LANGUAGES) | tr " " "\n" |sed -e '/\./d' | sort > LINGUAS
$(MSGFMT) --desktop -d . --template $< -o $@ $(MSGFMT) --desktop -d . --template $< -o $@
cp -f $@ ../../runtime/$@
update-po: $(LANGUAGES) update-po: $(LANGUAGES)

2
src/version.c
View File

@ -767,6 +767,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1240,
/**/ /**/
1239, 1239,
/**/ /**/