equal
deleted
inserted
replaced
83 .PHONY: upgrade |
83 .PHONY: upgrade |
84 upgrade: |
84 upgrade: |
85 \ |
85 \ |
86 mkdir -p $(mylispdir); \ |
86 mkdir -p $(mylispdir); \ |
87 rm -f $(emacsdir)/autoload-my.el; \ |
87 rm -f $(emacsdir)/autoload-my.el; \ |
88 mv $(emacsdir)/my-lisp $(mylispdir); \ |
88 rm -f ~/.emacs; \ |
89 mv ~/.emacs-my $(mylispdir)/.emacs || true; \ |
89 [ -d $(emacsdir)/my-lisp ] && mv $(emacsdir)/my-lisp $(mylispdir); \ |
90 mv ~/.emacs-custom.el $(mylispdir)/.emacs-custom || true; \ |
90 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 \ |
91 mv ~/.emacs-pre $(mylispdir) || true; \ |
91 if [ -f ~/$$f ]; then [ -f $(emacsdir)/$$f ] && mv ~/$$f $(emacsdir)/$$f.1 || mv ~/$$f $(emacsdir); fi; \ |
92 mv ~/.emacs-post $(mylispdir) || true; \ |
92 if [ -f $(mylispdir)/$$f ]; then [ -f $(emacsdir)/$$f ] && mv $(mylispdir)/$$f $(emacsdir)/$$f.2 || mv $(mylispdir)/$$f $(emacsdir); fi; \ |
93 mv ~/.emacs-places $(mylispdir) || true; \ |
|
94 mv ~/.emacs.desktop $(mylispdir) || true; \ |
|
95 mv ~/.emacs.bmk $(mylispdir) || true; \ |
|
96 rm -f ~/.emacs-autogen; \ |
|
97 \ |
|
98 rm -f ~/.emacs ~/.emacs-places; \ |
|
99 for f in $(mylispdir)/.emacs*; do \ |
|
100 mv $$f $(emacsdir) || true; \ |
|
101 done; \ |
93 done; \ |
102 mv ~/.recentf ~/.ido.last $(emacsdir) || true |
94 mv ~/.recentf ~/.ido.last $(emacsdir) || true |
103 |
95 |
104 .PHONY: install-all |
96 .PHONY: install-all |
105 install-all: install |
97 install-all: install |