git.iko.soy/typeable/pandoc
on master help sign in
Fixes from last review:
2b40ef5roktas
Makefile+5−5
@@ -80,7 +80,7 @@ all: build-program
80 ./$(MAIN) -s -w latex $< >$@ || rm -f $@
80 ./$(MAIN) -s -w latex $< >$@ || rm -f $@
81%.rtf: % $(MAIN)
81%.rtf: % $(MAIN)
82 ./$(MAIN) -s -w rtf $< >$@ || rm -f $@
82 ./$(MAIN) -s -w rtf $< >$@ || rm -f $@
83−%.pdf: % $(MAIN)
83+%.pdf: % $(MAIN) markdown2pdf
84 sh ./markdown2pdf $< || rm -f $@
84 sh ./markdown2pdf $< || rm -f $@
85
85
86.PHONY: templates
86.PHONY: templates
@@ -115,8 +115,8 @@ $(EXECS): $(BUILDDIR)
115 done
115 done
116
116
117.PHONY: build-doc
117.PHONY: build-doc
118−cleanup_files+=README.html
118+cleanup_files+=README.html INSTALL.html
119−build-doc: $(DOCS)
119+build-doc: $(DOCS) INSTALL.html
120
120
121.PHONY: build-program
121.PHONY: build-program
122build-program: build-exec build-doc
122build-program: build-exec build-doc
@@ -130,7 +130,7 @@ html/: configure
130 $(BUILDCMD) haddock && mv $(BUILDDIR)/doc/html .
130 $(BUILDCMD) haddock && mv $(BUILDDIR)/doc/html .
131
131
132.PHONY: build-all
132.PHONY: build-all
133−build-all: all build-lib-doc
133+build-all: build-program build-lib-doc
134
134
135# User documents installation.
135# User documents installation.
136.PHONY: install-doc uninstall-doc
136.PHONY: install-doc uninstall-doc
@@ -201,7 +201,7 @@ osx_src:=osx
201doc_more:=README.rtf LICENSE.rtf $(osx_src)/Welcome.rtf
201doc_more:=README.rtf LICENSE.rtf $(osx_src)/Welcome.rtf
202osx_pkg_name:=Pandoc_$(VERSION).pkg
202osx_pkg_name:=Pandoc_$(VERSION).pkg
203cleanup_files+=$(osx_dest) $(doc_more) $(osx_pkg_name)
203cleanup_files+=$(osx_dest) $(doc_more) $(osx_pkg_name)
204−osx-pkg-prep: $(osx_dest)
204+osx-pkg-prep: build-program $(osx_dest)
205$(osx_dest)/: $(doc_more)
205$(osx_dest)/: $(doc_more)
206 -rm -rf $(osx_dest)
206 -rm -rf $(osx_dest)
207 $(INSTALL) -d $(osx_dest)
207 $(INSTALL) -d $(osx_dest)