To: vim_dev@googlegroups.com Subject: Patch 7.4.2289 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.2289 Problem: When installing and $DESTDIR is set the icons probably won't be installed. Solution: Create the icon directories if $DESTDIR is not empty. (Danek Duvall) Files: src/Makefile *** ../vim-7.4.2288/src/Makefile 2016-08-28 18:10:28.335286000 +0200 --- src/Makefile 2016-08-28 20:54:06.434841588 +0200 *************** *** 2457,2463 **** chmod $(FILEMOD) $(DEST_KMAP)/README.txt $(DEST_KMAP)/*.vim; \ fi ! # install the icons for KDE, if the directory exists and the icon doesn't. ICON48PATH = $(DESTDIR)$(DATADIR)/icons/hicolor/48x48/apps ICON32PATH = $(DESTDIR)$(DATADIR)/icons/locolor/32x32/apps ICON16PATH = $(DESTDIR)$(DATADIR)/icons/locolor/16x16/apps --- 2457,2464 ---- chmod $(FILEMOD) $(DEST_KMAP)/README.txt $(DEST_KMAP)/*.vim; \ fi ! # Install the icons for KDE, if the directory exists and the icon doesn't. ! # Always when $(DESTDIR) is not empty. ICON48PATH = $(DESTDIR)$(DATADIR)/icons/hicolor/48x48/apps ICON32PATH = $(DESTDIR)$(DATADIR)/icons/locolor/32x32/apps ICON16PATH = $(DESTDIR)$(DATADIR)/icons/locolor/16x16/apps *************** *** 2465,2470 **** --- 2466,2476 ---- DESKTOPPATH = $(DESTDIR)$(DATADIR)/applications KDEPATH = $(HOME)/.kde/share/icons install-icons: + if test -n "$(DESTDIR)"; then \ + $(SHELL) ./mkinstalldirs $(ICON48PATH) $(ICON32PATH) \ + $(ICON16PATH) $(DESKTOPPATH); \ + fi + if test -d $(ICON48PATH) -a -w $(ICON48PATH) \ -a ! -f $(ICON48PATH)/gvim.png; then \ $(INSTALL_DATA) $(SCRIPTSOURCE)/vim48x48.png $(ICON48PATH)/gvim.png; \ *** ../vim-7.4.2288/src/version.c 2016-08-28 20:14:09.539635701 +0200 --- src/version.c 2016-08-28 20:55:01.682359034 +0200 *************** *** 765,766 **** --- 765,768 ---- { /* Add new patch number below this line */ + /**/ + 2289, /**/ -- hundred-and-one symptoms of being an internet addict: 92. It takes you two hours to check all 14 of your mailboxes. /// Bram Moolenaar -- Bram@Moolenaar.net -- 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 ///