# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1444846761 -10800
# Node ID b638d2b23ec9972e5b765e98c4fcccf4147d67a8
# Parent  9750529d15df238ce375eb53a40ec09f46448777
Use built-in options for elisp actions.

diff -r 9750529d15df -r b638d2b23ec9 Makefile
--- a/Makefile	Wed Oct 14 14:17:16 2015 +0300
+++ b/Makefile	Wed Oct 14 21:19:21 2015 +0300
@@ -136,15 +136,18 @@
 	for file in .emacs-pre .emacs-post; do \
 		[ -f $(emacsdir)/$$file ] || cp $$file $(emacsdir)/$$file; \
 	done
-	cp .emacs $(emacsdir)/init.el
-	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)"))'
+	\
+cp .emacs $(emacsdir)/init.el; \
+cp .emacs-defs .emacs-my $(emacsdir)
 	\
-$(EMACS) --batch --eval='(load "$(curdir)/.emacs-defs")' --eval='(my-load.add-my-loadpaths)' --eval='(load "$(emacsdir)/.emacs-pre")' \
+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) --batch -Q --eval='(let ((generated-autoload-file "$(mylispdir)/loaddefs.el")) (update-directory-autoloads "$(mylispdir)"))'
+	\
+$(EMACS) --batch --load "$(curdir)/.emacs-defs" -f 'my-load.add-my-loadpaths' --load "$(emacsdir)/.emacs-pre" \
   --eval='(byte-compile-file "$(emacsdir)/.emacs-my")' --eval='(byte-force-recompile "$(mylispdir)")'
 	cp -r srecode/ $(HOME)/.emacs.d/