# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1424734491 -7200
# Node ID 6c7c0366b4be75a84e539c32ae89702b234c41da
# Parent  c7e52e93465a333aaaaa2175ef91163875e3c35b
Improve previous upgrade script to handle more situations.

diff -r c7e52e93465a -r 6c7c0366b4be Makefile
--- a/Makefile	Tue Feb 24 01:27:49 2015 +0200
+++ b/Makefile	Tue Feb 24 01:34:51 2015 +0200
@@ -82,22 +82,17 @@
 .PHONY: upgrade
 upgrade:
 	\
-if [ ! -d $(mylispdir) ]; then \
-  if [ -d $(emacsdir)/my-lisp ]; then \
-    rm -f $(emacsdir)/autoload-my.el; \
-    mv $(emacsdir)/my-lisp $(mylispdir); \
-  else \
-    mkdir -p $(mylispdir); \
-  fi; \
-  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; \
-fi
+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 \