--- a/Makefile	Wed Feb 25 01:26:53 2015 +0200
+++ b/Makefile	Wed Feb 25 13:47:29 2015 +0200
@@ -6,7 +6,7 @@
 ################################################################
 # Standard Makefile settings.
 
-SHELL = /bin/sh
+SHELL = /bin/sh -x
 export PATH := /bin:/usr/bin:${PATH}
 
 # Disable built in pattern rules.
@@ -84,21 +84,15 @@
 	\
 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; \
+[ -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; \
 for f in $(mylispdir)/.emacs*; do \
-  mv $$f $(emacsdir) || true; \
-done; \
-mv ~/.ido.last $(emacsdir) || true
+  fn=$${f##*/}; \
+  if [ -f $$f ]; then [ -f $(emacsdir)/$$fn ] && mv $$f $(emacsdir)/$$fn.3 || mv $$f $(emacsdir); fi; \
+done;
 
 .PHONY: install-all
 install-all: install