--- a/Makefile	Wed Mar 11 23:57:02 2015 +0200
+++ b/Makefile	Fri Mar 13 19:26:20 2015 +0200
@@ -85,19 +85,11 @@
 	\
 mkdir -p $(mylispdir); \
 rm -f $(emacsdir)/autoload-my.el; \
-mv $(emacsdir)/my-lisp $(mylispdir); \
-mv ~/.emacs-my $(mylispdir)/.emacs || true; \
-mv ~/.emacs-custom.el $(mylispdir)/.emacs-custom || true; \
-mv ~/.emacs-pre $(mylispdir) || true; \
-mv ~/.emacs-post $(mylispdir) || true; \
-mv ~/.emacs-places $(mylispdir) || true; \
-mv ~/.emacs.desktop $(mylispdir) || true; \
-mv ~/.emacs.bmk $(mylispdir) || true; \
-rm -f ~/.emacs-autogen; \
-	\
-rm -f ~/.emacs ~/.emacs-places; \
-for f in $(mylispdir)/.emacs*; do \
-  mv $$f $(emacsdir) || true; \
+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 \
+  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