git.iko.soy/typeable/pandoc
on master help sign in
Fixes from last review:

+ Add markdown2pdf to %.pdf dependencies. + Make build-all target explicitly depend on build-program, instead of 'all' which might be changed in future. + Add build-program to osx-pkg-prep for the sake of explicitness. + Generate INSTALL.html in build-doc. git-svn-id: https://pandoc.googlecode.com/svn/trunk@77 788f1e2b-df1e-0410-8736-df70ead52e1b

commit2b40ef5d03ad67cf637769a3fb6fdb1b74350c3f authorroktas <roktas@788f1e2b-df1e-0410-8736-df70ead52e1b> dateTue 7 Nov 2006, 10:37 (20 years ago) parent9159ebd
1 file changed+5−5
compare with master
unifiedsplit
Makefile+5−5
Makefile+5−5
@@ -80,7 +80,7 @@ all: build-program
8080 ./$(MAIN) -s -w latex $< >$@ || rm -f $@
8181%.rtf: % $(MAIN)
8282 ./$(MAIN) -s -w rtf $< >$@ || rm -f $@
83−%.pdf: % $(MAIN)
83+%.pdf: % $(MAIN) markdown2pdf
8484 sh ./markdown2pdf $< || rm -f $@
8585
8686.PHONY: templates
@@ -115,8 +115,8 @@ $(EXECS): $(BUILDDIR)
115115 done
116116
117117.PHONY: build-doc
118−cleanup_files+=README.html
119−build-doc: $(DOCS)
118+cleanup_files+=README.html INSTALL.html
119+build-doc: $(DOCS) INSTALL.html
120120
121121.PHONY: build-program
122122build-program: build-exec build-doc
@@ -130,7 +130,7 @@ html/: configure
130130 $(BUILDCMD) haddock && mv $(BUILDDIR)/doc/html .
131131
132132.PHONY: build-all
133−build-all: all build-lib-doc
133+build-all: build-program build-lib-doc
134134
135135# User documents installation.
136136.PHONY: install-doc uninstall-doc
@@ -201,7 +201,7 @@ osx_src:=osx
201201doc_more:=README.rtf LICENSE.rtf $(osx_src)/Welcome.rtf
202202osx_pkg_name:=Pandoc_$(VERSION).pkg
203203cleanup_files+=$(osx_dest) $(doc_more) $(osx_pkg_name)
204−osx-pkg-prep: $(osx_dest)
204+osx-pkg-prep: build-program $(osx_dest)
205205$(osx_dest)/: $(doc_more)
206206 -rm -rf $(osx_dest)
207207 $(INSTALL) -d $(osx_dest)