aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b>2008-01-23 02:17:35 +0000
committerfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b>2008-01-23 02:17:35 +0000
commit790fd4612bb1645214e6e90df92bf8ebf90115f9 (patch)
tree38bde6f737db69d2af402641fad16deaa4acb79e
parent42359e63c9a7ddeb67e639296fc20a1e3eaac7dc (diff)
downloadpandoc-790fd4612bb1645214e6e90df92bf8ebf90115f9.tar.gz
Changed names of HTML man pages to *.1.html on website.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1192 788f1e2b-df1e-0410-8736-df70ead52e1b
-rw-r--r--Makefile4
-rw-r--r--web/Makefile4
-rw-r--r--web/index.txt.in8
3 files changed, 8 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 168bd744b..dc8e62c19 100644
--- a/Makefile
+++ b/Makefile
@@ -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)