Patch 7.4.909 (after 7.4.905)
Problem: "make install" fails.
Solution: Only try installing desktop files if the destination directory
exists.
Files: src/Makefile
*** ../vim-7.4.908/src/Makefile 2015-11-02 12:50:49.756534398 +0100
--- src/Makefile 2015-11-03 22:00:24.996063518 +0100
***************
*** 2213,2218 ****
--- 2213,2219 ----
ICON48PATH = $(DESTDIR)$(DATADIR)/icons/hicolor/48x48/apps
ICON32PATH = $(DESTDIR)$(DATADIR)/icons/locolor/32x32/apps
ICON16PATH = $(DESTDIR)$(DATADIR)/icons/locolor/16x16/apps
+ DESKTOPPATH = $(DESTDIR)$(DATADIR)/applications
KDEPATH = $(HOME)/.kde/share/icons
install-icons:
if test -d $(ICON48PATH) -a -w $(ICON48PATH) \
***************
*** 2227,2234 ****
-a ! -f $(ICON16PATH)/gvim.png; then \
$(INSTALL_DATA) $(SCRIPTSOURCE)/vim16x16.png $(ICON16PATH)/gvim.png;
\
fi
! $(INSTALL_DATA) $(SCRIPTSOURCE)/vim.desktop
$(SCRIPTSOURCE)/gvim.desktop \
! $(DESTDIR)$(DATADIR)/applications
$(HELPSOURCE)/vim.1 $(MACROSOURCE) $(TOOLSSOURCE):
@echo Runtime files not found.
--- 2228,2238 ----
-a ! -f $(ICON16PATH)/gvim.png; then \
$(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); \
! fi
$(HELPSOURCE)/vim.1 $(MACROSOURCE) $(TOOLSSOURCE):
@echo Runtime files not found.
*** ../vim-7.4.908/src/version.c 2015-11-02 17:35:37.335704679 +0100
--- src/version.c 2015-11-03 21:56:28.394899507 +0100
***************
*** 743,744 ****
--- 743,746 ----
{ /* Add new patch number below this line */
+ /**/
+ 909,
/**/
--
>From "know your smileys":
;-0 Can't find shift key
,-9 Kann Umschalttaste nicht finden
/// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
