X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=Makefile;h=1279d4cdf039ff9562386f18bd3f6ef1484e944a;hb=4d965784a39d48f12c59d016770ec50f0664408f;hp=a5cc3514e30fc9738d6106622ebaad6bf79bc59f;hpb=7ba82c345f08c4021a1fc9b9cf4a3bdbbb36f4d1;p=blog.git

diff --git a/Makefile b/Makefile
index a5cc351..1279d4c 100644
--- a/Makefile
+++ b/Makefile
@@ -5,24 +5,32 @@ OUTDIR :=
 FORCE := "no"
 BLOGDIR := $(PWD)
 
-all:
-	$(emacs) -Q --script blog.el $(OUTDIR) $(FORCE)
+# To color the code block, install htmlize package
+INIT_PACKAGES = "(progn \
+				(require 'package) \
+				(add-to-list 'package-archives '(\"melpa\" . \"http://melpa.org/packages/\")) \
+				(package-initialize) \
+				(unless (package-installed-p 'htmlize) (package-refresh-contents) (package-install 'htmlize)))"
 
 # used for automation on server
 update:
-	git pull && $(emacs) -Q --script blog.el "~/www/html" "true" 
+	git pull
 
-publish:
-	$(emacs) -Q --batch -l my-publish.el index.org \
+publish: update
+	$(emacs) -Q --batch  \
+		--eval $(INIT_PACKAGES) \
 		--eval '(setq debug-on-error t)' \
+		-l my-publish.el index.org \
 		--eval '(blog-setup-project-alist "$(BLOGDIR)" "$(OUTDIR)")' \
 		--eval '(org-publish-current-project)'
 
 # test will force publishing all files in the porject 
 test:
-	$(emacs) -Q --batch -l my-publish.el index.org \
+	$(emacs) -Q --batch \
+		--eval $(INIT_PACKAGES) \
 		--eval '(setq debug-on-error t)' \
-		--eval '(blog-setup-project-alist "$(BLOGDIR)"' \
+		-l my-publish.el index.org \
+		--eval '(blog-setup-project-alist "$(BLOGDIR)")' \
 		--eval '(org-publish-current-project t)'
 
 clean: