af46691 · typeable/pandoc

git.iko.soy/typeable/pandoc

Makefile: specify --template explicitly when using pandoc.

Reason: pandoc may not yet have been installed, so the templates may not be in the cabal data directory. Resolves Issue #192. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1792 788f1e2b-df1e-0410-8736-df70ead52e1b

commitaf46691a209dad112754fb99810f1abb17971371 authorfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> dateSun 3 Jan 2010, 08:24 (17 years ago) parentdba0b40

1 file changed+6−5

compare with master

unifiedsplit

Makefile+6−5

Makefile+6−5

@@ -79,13 +79,13 @@ all: build-program

7979

8080# Document process rules.

8181%.html: % $(MAIN)

82− ./$(MAIN) -s -S --toc $< >$@ || rm -f $@

82+ ./$(MAIN) -s --template templates/html.template -S --toc $< >$@ || rm -f $@

8383%.tex: % $(MAIN)

84− ./$(MAIN) -s -w latex $< >$@ || rm -f $@

84+ ./$(MAIN) -s --template templates/latex.template -w latex $< >$@ || rm -f $@

8585%.rtf: % $(MAIN)

86− ./$(MAIN) -s -w rtf $< >$@ || rm -f $@

86+ ./$(MAIN) -s --template templates/rtf.template -w rtf $< >$@ || rm -f $@

8787%.pdf: % $(MAIN) markdown2pdf

88− sh ./markdown2pdf $< || rm -f $@

88+ sh ./markdown2pdf --template templates/latex.template $< || rm -f $@

8989%.txt: %

9090 perl -p -e 's/\n/\r\n/' $< > $@ || rm -f $@ # convert to DOS line endings

9191

@@ -268,7 +268,8 @@ $(tarball):

268268.PHONY: website

269269web_src:=web

270270web_dest:=pandoc-website

271−make_page:=./$(MAIN) -s -S -B $(web_src)/header.html \

271+make_page:=./$(MAIN) -s --template templates/html.template \

272+ -S -B $(web_src)/header.html \

272273 -A $(web_src)/footer.html \

273274 -H $(web_src)/css

274275cleanup_files+=$(web_dest)