diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | web/Makefile | 4 | ||||
| -rw-r--r-- | web/index.txt.in | 8 |
3 files changed, 8 insertions, 8 deletions
@@ -260,7 +260,7 @@ win_pkg_name:=$(PKGID).zip win_docs:=COPYING.txt COPYRIGHT.txt BUGS.txt README.txt README.html cleanup_files+=$(win_pkg_name) $(win_docs) win-pkg: $(win_pkg_name) -$(win_pkg_name): $(PKG).exe $(win_docs) +$(win_pkg_name): $(PKG).exe $(win_docs) zip -r $(win_pkg_name) $(PKG).exe $(win_docs) .PHONY: test test-markdown @@ -340,7 +340,7 @@ $(web_dest) : html $(wildcard $(web_src)/*) debian/changelog \ cp README $(web_dest)/ ; \ cp INSTALL $(web_dest)/ ; \ cp $(MANDIR)/man1/pandoc.1.md $(web_dest)/ ; \ - cp $(MANDIR)/man1/*.1 $(web_dest)/ ; \ + cp $(MANPAGES) $(web_dest)/ ; \ } || { rm -rf $(web_dest); exit 1; } website: $(MAIN) $(web_dest) PANDOC_PATH=$(shell pwd) make -C $(web_dest) diff --git a/web/Makefile b/web/Makefile index e6ecba1d5..625ae7dfb 100644 --- a/web/Makefile +++ b/web/Makefile @@ -1,4 +1,4 @@ -ALL := index.html README.html INSTALL.html examples.html pandoc1.html markdown2pdf1.html html2markdown1.html hsmarkdown1.html html2x.html +ALL := index.html README.html INSTALL.html examples.html pandoc.1.html markdown2pdf.1.html html2markdown.1.html hsmarkdown.1.html html2x.html PANDOC_PATH ?= $(dir $(shell which pandoc)) MAKEPAGE = $(PANDOC_PATH)/pandoc -s -S -H css -A footer.html all : $(ALL) @@ -27,7 +27,7 @@ INSTALL.html : INSTALL css %.html : %.txt css $(MAKEPAGE) $< > $@ -%1.html : %.1 +%.1.html : %.1 groff -man -T html $< > $@ %.html : % css diff --git a/web/index.txt.in b/web/index.txt.in index 59ab3734d..a7bf8fdf6 100644 --- a/web/index.txt.in +++ b/web/index.txt.in @@ -47,10 +47,10 @@ or [try pandoc on the web](/pandoc/try). - [User's Guide](README.html) - [Demonstrations](examples.html) - Man pages - - [`pandoc(1)`](pandoc1.html) - - [`markdown2pdf(1)`](markdown2pdf1.html) - - [`html2markdown(1)`](html2markdown1.html) - - [`hsmarkdown(1)`](hsmarkdown1.html) + - [`pandoc(1)`](pandoc.1.html) + - [`markdown2pdf(1)`](markdown2pdf.1.html) + - [`html2markdown(1)`](html2markdown.1.html) + - [`hsmarkdown(1)`](hsmarkdown.1.html) - [Library documentation](doc/index.html) (for Haskell programmers) - [Installation instructions](INSTALL.html) - [Changelog](changelog.txt) |