diff options
| author |  Tom Willemsen | 2013-01-04 00:06:15 +0100 |
|---|---|---|
| committer | Tom Willemsen | 2013-01-04 00:06:15 +0100 |
| commit | 12fbc83cc7637548bcefaed1d0b7aea81064c67f (patch) | |
| tree | 7cf66d3804a87e9154479d6d00f72d17002a14bf /.emacs.d/Makefile | |
| parent | ef288f8ad6c5fe22161fd55d69792e5d0f340b01 (diff) | |
| parent | 1be69078ad8c1af62de79b80345a72d2b8490b04 (diff) | |
| download | dotfiles-12fbc83cc7637548bcefaed1d0b7aea81064c67f.tar.gz dotfiles-12fbc83cc7637548bcefaed1d0b7aea81064c67f.zip | |
Merge remote-tracking branch 'origin/master' into phoenix
Conflicts:
.emacs.d/init.el
Diffstat (limited to '.emacs.d/Makefile')
| -rw-r--r-- | .emacs.d/Makefile | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/.emacs.d/Makefile b/.emacs.d/Makefile index 0c716a8..fc17095 100644 --- a/.emacs.d/Makefile +++ b/.emacs.d/Makefile @@ -1,5 +1,11 @@ DESTDIR:=$(DESTDIR)/.emacs.d -objects=init.elc init.el gnus.elc gnus.el +objects=init.elc init.el gnus.elc gnus.el init2.elc init2.el modules=eshell site-lisp snippets +EMACS=emacs + include ../dotfiles.mk + +init2.el: init.org + $(EMACS) -Q -batch \ + -eval "(progn (require 'org) (require 'ob-tangle) (org-babel-tangle-file \"$^\"))" |