diff -r b6c514e81d2c -r 9250e3ad5f4a Makefile
--- a/Makefile	Tue Jan 26 11:08:33 2010 +0200
+++ b/Makefile	Thu Jan 28 22:27:45 2010 +0200
@@ -1,51 +1,45 @@
-# Copyright (C) 2008 by Oleksandr Gavenko <gavenkoa@gmail.com>
+# Copyright (C) 2008-2010 by Oleksandr Gavenko <gavenkoa@gmail.com>
+#
+# You can do anything with this file without any warranty.
 
 ifeq '' '$(HOME)'
   $(error Home env var not set!)
 endif
 
-.PHONY: all install preinstall install-all preinstall-all update-dot-emacs-pre update-dot-emacs-post tar
-
+.PHONY: all
 all: install
 
-install: preinstall update-dot-emacs-pre update-dot-emacs-post
+.PHONY: install-all
+install-all: install
+	cp .emacs-pre $(HOME)/.emacs-pre
+	cp .emacs-post $(HOME)/.emacs-post
 
-preinstall: .emacs .emacs-my .emacs-pre .emacs-post
+.PHONY: install
+install: .emacs .emacs-my .emacs-pre .emacs-post $(wildcard lisp/*.el)
 	for file in .emacs-pre .emacs-post; do \
 		if [ ! -f $(HOME)/$$file ]; then cp $$file $(HOME)/$$file; fi; \
 	done
 	cp .emacs $(HOME)/.emacs
 	cp .emacs-my $(HOME)/.emacs-my
-
-install-all: preinstall-all update-dot-emacs-pre update-dot-emacs-post
-
-preinstall-all: .emacs .emacs-my .emacs-pre .emacs-post
-	for file in $^; do \
-		cp $$file $(HOME)/$$file; \
+	rm -f -r $(HOME)/.emacs.d/my-lisp
+	mkdir -p $(HOME)/.emacs.d/my-lisp
+	for file in $(wildcard lisp/*.el); do \
+		cp -f $$file $(HOME)/.emacs.d/my-lisp; \
 	done
+	emacs --batch \
+		--eval='(let ( (generated-autoload-file "~/.emacs.d/my-lisp/autoload-my.el") ) (update-directory-autoloads "~/.emacs.d/my-lisp") )'
 
-update-dot-emacs-pre:
-	for file in `cd template-pre; ls *.el`; do \
-		tag=$${file%.el}; \
-		if grep "DO NOT EDIT COMMENT! TAG: $$tag" $(HOME)/.emacs-pre; then \
-			:; \
-		else \
-			cat template-pre/$$file >>$(HOME)/.emacs-pre; \
-		fi; \
-	done
+.PHONY: uninstall
+uninstall:
+	@echo !!! Nothing done !!!
 
-update-dot-emacs-post:
-	for file in `cd template-post; ls *.el`; do \
-		tag=$${file%.el}; \
-		if grep "DO NOT EDIT COMMENT! TAG: $$tag" $(HOME)/.emacs-post; then \
-			:; \
-		else \
-			cat template-post/$$file >>$(HOME)/.emacs-post; \
-		fi; \
-	done
-
+.PHONY: tar
 tar:
 	tar cf dot-emacs.tar .emacs .emacs-my
 
+.PHONY: distclean
+distclean: clean
+
+.PHONY: clean
 clean:
 	rm -f dot-emacs.tar