Fix merge.
authorOleksandr Gavenko <gavenkoa@gmail.com>
Fri, 13 Mar 2015 20:57:08 +0200
changeset 1270 0e68ef7990ef
parent 1269 ffa96b1c6f9f
child 1271 d8012eba97a2
Fix merge.
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