--- a/Makefile	Thu Jan 28 20:01:05 2010 +0200
+++ b/Makefile	Thu Jan 28 20:14:19 2010 +0200
@@ -7,31 +7,22 @@
 .PHONY: all
 all: install
 
-.PHONY: install
-install: preinstall update-dot-emacs-pre
+.PHONY: install-all
+install-all: install
+	cp .emacs-pre $(HOME)/.emacs-pre
+	cp .emacs-post $(HOME)/.emacs-post
 
-.PHONY: preinstall
-preinstall: .emacs .emacs-my .emacs-pre .emacs-post
+.PHONY: install
+install: .emacs .emacs-my .emacs-pre .emacs-post $(wildcard template-pre/*.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
-
-.PHONY: install-all
-install-all: preinstall-all update-dot-emacs-pre
-
-.PHONY: preinstall-all
-preinstall-all: .emacs .emacs-my .emacs-pre .emacs-post
-	for file in $^; do \
-		cp $$file $(HOME)/$$file; \
-	done
-
-.PHONY: update-dot-emacs-pre
-update-dot-emacs-pre:
-	printf ";; DO NOT EDIT! This file automatically generated.\n\n" >$(HOME)/.emacs-pre-auto
-	for file in `cd template-pre; ls *.el`; do \
-		cat template-pre/$$file >>$(HOME)/.emacs-pre-auto; \
+	rm -r $(HOME)/.emacs.d/my
+	mkdir -p $(HOME)/.emacs.d/my
+	for file in $(wildcard template-pre/*.el); do \
+		cp -f $$file $(HOME)/.emacs.d/my; \
 	done
 
 .PHONY: tar