From efa975ed49a33accf3d8c0d674320f26c9ec1cca Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Thu, 3 Aug 2017 11:37:31 +0200
Subject: Emacs: Fix building emacs config files on macOS

---
 emacs/.emacs.d/Makefile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'emacs/.emacs.d/Makefile')

diff --git a/emacs/.emacs.d/Makefile b/emacs/.emacs.d/Makefile
index 7741ef3e..9f086ffd 100644
--- a/emacs/.emacs.d/Makefile
+++ b/emacs/.emacs.d/Makefile
@@ -1,5 +1,6 @@
 define EMACS_TANGLE
 (progn\
+  (require 'package)\
   (package-refresh-contents nil)\
   (setq vc-follow-symlinks nil)\
   (find-file \"init.org\")\
@@ -7,6 +8,8 @@ define EMACS_TANGLE
   (org-babel-tangle nil \"init.el\"))
 endef
 
+EMACS := ${NIX_LINK}/bin/emacs
+
 # The first target is the default.  `all` is typically defined here.
 all: init.elc
 
@@ -14,10 +17,10 @@ all: init.elc
 .PHONY: all clean
 
 init.el:
-	@emacs --batch --no-init-file --eval "$(EMACS_TANGLE)" --kill
+	$(EMACS) --batch --no-init-file --eval "$(EMACS_TANGLE)" --kill
 
 init.elc: init.el
-	@emacs --batch --no-init-file --funcall batch-byte-compile init.el
+	$(EMACS) --batch --no-init-file --funcall batch-byte-compile init.el
 
 clean:
 	rm init.el init.elc
-- 
cgit 1.4.1


From f4aa8c2484b2fc00afa5935e31164f0b4bb6c311 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Thu, 3 Aug 2017 12:11:01 +0200
Subject: Emacs: Update Makefile to only byte-compile init

---
 emacs/.emacs.d/Makefile | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

(limited to 'emacs/.emacs.d/Makefile')

diff --git a/emacs/.emacs.d/Makefile b/emacs/.emacs.d/Makefile
index 9f086ffd..71415d56 100644
--- a/emacs/.emacs.d/Makefile
+++ b/emacs/.emacs.d/Makefile
@@ -1,13 +1,3 @@
-define EMACS_TANGLE
-(progn\
-  (require 'package)\
-  (package-refresh-contents nil)\
-  (setq vc-follow-symlinks nil)\
-  (find-file \"init.org\")\
-  (require 'ob-tangle)\
-  (org-babel-tangle nil \"init.el\"))
-endef
-
 EMACS := ${NIX_LINK}/bin/emacs
 
 # The first target is the default.  `all` is typically defined here.
@@ -16,11 +6,8 @@ all: init.elc
 # These targets don't pertain to files
 .PHONY: all clean
 
-init.el:
-	$(EMACS) --batch --no-init-file --eval "$(EMACS_TANGLE)" --kill
-
 init.elc: init.el
 	$(EMACS) --batch --no-init-file --funcall batch-byte-compile init.el
 
 clean:
-	rm init.el init.elc
+	rm init.elc
-- 
cgit 1.4.1