--- a/Makefile	Fri Mar 13 21:10:31 2015 +0200
+++ b/Makefile	Fri Mar 13 21:21:33 2015 +0200
@@ -98,10 +98,14 @@
 	cp .emacs-pre $(emacsdir)/.emacs-pre
 	cp .emacs-post $(emacsdir)/.emacs-post
 
+define cleanup_mylispdir
+  find $(mylispdir) -type f '(' -name '*.el' -o -name '*.elc' ')' -delete
+endef
+
 .PHONY: install
 install:
 	mkdir -p $(mylispdir)
-	find $(mylispdir) -type f '(' -name '*.el' -o -name '*.elc' ')' -delete
+	$(cleanup_mylispdir)
 	for file in .emacs-pre .emacs-post; do \
 		[ -f $(emacsdir)/$$file ] || cp $$file $(emacsdir)/$$file; \
 	done
@@ -119,8 +123,8 @@
 
 .PHONY: uninstall
 uninstall:
-	rm -f $(HOME)/.emacs $(mylispdir)/.emacs-my $(mylispdir)/.emacs-autogen
-	find $(mylispdir) -type f -name '*.el' -delete
+	rm -f $(patsubst %,$(emacsdir)/%, init.el .emacs-defs .emacs-my .emacs-autogen)
+	$(cleanup_mylispdir)
 	rm -f -r $(emacsdir)/srecode
 
 .PHONY: tar