update makefile
[blog.git] / Makefile
index 63252fc..1279d4c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -12,25 +12,24 @@ INIT_PACKAGES = "(progn \
                                (package-initialize) \
                                (unless (package-installed-p 'htmlize) (package-refresh-contents) (package-install 'htmlize)))"
 
-all:
-       $(emacs) -Q --script blog.el $(OUTDIR) $(FORCE)
-
 # 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)' \
+               -l my-publish.el index.org \
                --eval '(blog-setup-project-alist "$(BLOGDIR)")' \
                --eval '(org-publish-current-project t)'