diff --git a/src/Makefile b/src/Makefile index 2da0c6f4af..875a0de6a2 100644 --- a/src/Makefile +++ b/src/Makefile @@ -2624,7 +2624,7 @@ ICONTHEMEPATH = $(DATADIR)/icons/hicolor DESKTOPPATH = $(DESTDIR)$(DATADIR)/applications KDEPATH = $(HOME)/.kde/share/icons install-icons: - if test -n "$(DESTDIR)"; then \ + if test -n "$(DESTDIR)$(DATADIR)"; then \ $(MKDIR_P) $(ICON48PATH) $(ICON32PATH) \ $(ICON16PATH) $(DESKTOPPATH); \ fi @@ -2845,6 +2845,8 @@ uninstall_runtime: -rm -f $(SYS_OPTWIN_FILE) -rm -f $(DEST_COL)/*.vim $(DEST_COL)/README.txt -rm -rf $(DEST_COL)/tools + -rm -f $(DESKTOPPATH)/vim.desktop $(DESKTOPPATH)/gvim.desktop + -rm -f $(ICON16PATH)/gvim.png $(ICON32PATH)/gvim.png $(ICON48PATH)/gvim.png -rm -rf $(DEST_COL)/lists -rm -f $(DEST_SYN)/shared/*.vim $(DEST_SYN)/shared/README.txt -rm -f $(DEST_SYN)/modula2/opt/*.vim diff --git a/src/version.c b/src/version.c index 0aa9683eb2..72cce6580a 100644 --- a/src/version.c +++ b/src/version.c @@ -704,6 +704,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 687, /**/ 686, /**/