--- a/Makefile	Sun Mar 01 13:09:44 2015 +0200
+++ b/Makefile	Sun Mar 01 13:10:30 2015 +0200
@@ -24,6 +24,7 @@
 # Helper definition.
 
 which = $(firstword $(foreach item,$(subst :, ,$(PATH)),$(wildcard $(item)/$1)))
+curdir := $(realpath .)
 
 ################################################################
 # Platform/environment definition.
@@ -113,12 +114,15 @@
 		[ -f $(emacsdir)/$$file ] || cp $$file $(emacsdir)/$$file; \
 	done
 	cp .emacs $(emacsdir)/init.el
-	cp .emacs-my $(emacsdir)/.emacs-my
+	cp .emacs-defs .emacs-my $(emacsdir)
 	mkdir -p $(emacsdir)/server $(HOME)/.gnus/scores
 	cp all.SCORE $(HOME)/.gnus/scores
 	cp -f $(EL_FILES) $(mylispdir); \
+	./.emacs-autogen.sh $(emacsdir)/.emacs-autogen; \
 	$(EMACS) -Q --batch --eval='(let ((generated-autoload-file "$(mylispdir)/loaddefs.el")) (update-directory-autoloads "$(mylispdir)"))'
-	./.emacs-autogen.sh $(emacsdir)/.emacs-autogen
+	\
+$(EMACS) -Q --batch --eval='(load "$(curdir)/.emacs-defs")' --eval='(my-load.add-my-loadpaths)' --eval='(load "$(emacsdir)/.emacs-pre")' \
+  --eval='(byte-compile-file "$(emacsdir)/.emacs-my")' --eval='(byte-force-recompile "$(mylispdir)")'
 	cp -r srecode/ $(HOME)/.emacs.d/
 
 .PHONY: uninstall