# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1426273028 -7200
# Node ID 0e68ef7990ef08ba72ed2ba12bcd82aeee8b6816
# Parent  ffa96b1c6f9f69070e3d0cb3fe5e1c3a08f490e9
Fix merge.

diff -r ffa96b1c6f9f -r 0e68ef7990ef Makefile
--- a/Makefile	Fri Mar 13 19:26:20 2015 +0200
+++ b/Makefile	Fri Mar 13 20:57:08 2015 +0200
@@ -87,11 +87,11 @@
 rm -f $(emacsdir)/autoload-my.el; \
 rm -f ~/.emacs; \
 [ -d $(emacsdir)/my-lisp ] && mv $(emacsdir)/my-lisp $(mylispdir); \
-for f in .emacs-my .emacs-custom.el .emacs-pre .emacs-post .emacs-places .emacs.desktop .emacs.bmk .emacs-places .emacs-autogen .ido.last; do \
+for f in .emacs-my .emacs-custom.el .emacs-pre .emacs-post .emacs-places .emacs.desktop .emacs.bmk .emacs-places .emacs-autogen .ido.last .recentf; do \
   if [ -f ~/$$f ]; then [ -f $(emacsdir)/$$f ] && mv ~/$$f $(emacsdir)/$$f.1 || mv ~/$$f $(emacsdir); fi; \
   if [ -f $(mylispdir)/$$f ]; then [ -f $(emacsdir)/$$f ] && mv $(mylispdir)/$$f $(emacsdir)/$$f.2 || mv $(mylispdir)/$$f $(emacsdir); fi; \
 done; \
-mv ~/.recentf ~/.ido.last $(emacsdir) || true
+make install
 
 .PHONY: install-all
 install-all: install