# HG changeset patch # User Oleksandr Gavenko # Date 1316588917 -10800 # Node ID f0697b66858fa255f2fc734ae927511e6d0aa57a # Parent 9ec79850e725162c0954375dfe8a297cc782b582# Parent 87b7f0f427dc39ddd7f9524f9e1267fdb4f4e92a Automated merge with file:///cygdrive/d/srv/hg-home/dot-emacs diff -r 9ec79850e725 -r f0697b66858f Makefile --- a/Makefile Mon Sep 19 21:05:09 2011 +0300 +++ b/Makefile Wed Sep 21 10:08:37 2011 +0300 @@ -58,7 +58,6 @@ if [ ! -f $(HOME)/$$file ]; then cp $$file $(HOME)/$$file; fi; \ done cp .emacs $(HOME)/.emacs - ./.emacs-autogen.sh $(HOME)/.emacs-autogen cp .emacs-my $(HOME)/.emacs-my rm -f -r $(HOME)/.emacs.d/my-lisp mkdir -p $(HOME)/.emacs.d/my-lisp @@ -67,6 +66,7 @@ done $(EMACS) --batch \ --eval='(let ( (generated-autoload-file "~/.emacs.d/my-lisp/autoload-my.el") ) (update-directory-autoloads "~/.emacs.d/my-lisp") )' + ./.emacs-autogen.sh $(HOME)/.emacs-autogen .PHONY: uninstall uninstall: