equal
deleted
inserted
replaced
82 .PHONY: upgrade |
82 .PHONY: upgrade |
83 upgrade: |
83 upgrade: |
84 \ |
84 \ |
85 mkdir -p $(mylispdir); \ |
85 mkdir -p $(mylispdir); \ |
86 rm -f $(emacsdir)/autoload-my.el; \ |
86 rm -f $(emacsdir)/autoload-my.el; \ |
|
87 rm -f ~/.emacs; \ |
87 [ -d $(emacsdir)/my-lisp ] && mv $(emacsdir)/my-lisp $(mylispdir); \ |
88 [ -d $(emacsdir)/my-lisp ] && mv $(emacsdir)/my-lisp $(mylispdir); \ |
88 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 \ |
89 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 \ |
89 if [ -f ~/$$f ]; then [ -f $(emacsdir)/$$f ] && mv ~/$$f $(emacsdir)/$$f.1 || mv ~/$$f $(emacsdir); fi; \ |
90 if [ -f ~/$$f ]; then [ -f $(emacsdir)/$$f ] && mv ~/$$f $(emacsdir)/$$f.1 || mv ~/$$f $(emacsdir); fi; \ |
90 if [ -f $(mylispdir)/$$f ]; then [ -f $(emacsdir)/$$f ] && mv $(mylispdir)/$$f $(emacsdir)/$$f.2 || mv $(mylispdir)/$$f $(emacsdir); fi; \ |
91 if [ -f $(mylispdir)/$$f ]; then [ -f $(emacsdir)/$$f ] && mv $(mylispdir)/$$f $(emacsdir)/$$f.2 || mv $(mylispdir)/$$f $(emacsdir); fi; \ |
91 done; \ |
92 done; \ |
92 for f in `find $(mylispdir) -maxdepth 1 -type f -name '.emacs?*'`; do \ |
93 for f in `find $(mylispdir) -maxdepth 1 -type f -name '.emacs?*'`; do \ |
93 fn=$${f##*/}; \ |
94 fn=$${f##*/}; \ |
94 [ -f $(emacsdir)/$$fn ] && mv $$f $(emacsdir)/$$fn.3 || mv $$f $(emacsdir); \ |
95 [ -f $(emacsdir)/$$fn ] && mv $$f $(emacsdir)/$$fn.3 || mv $$f $(emacsdir); \ |
95 done; |
96 done; \ |
|
97 make install |
96 |
98 |
97 .PHONY: install-all |
99 .PHONY: install-all |
98 install-all: install |
100 install-all: install |
99 cp .emacs-pre $(emacsdir)/.emacs-pre |
101 cp .emacs-pre $(emacsdir)/.emacs-pre |
100 cp .emacs-post $(emacsdir)/.emacs-post |
102 cp .emacs-post $(emacsdir)/.emacs-post |