about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2009-09-17 20:15:31 -0700
committerEric Wong <normalperson@yhbt.net>2009-09-17 20:17:55 -0700
commit711ca5408415fd3f435d0a36d3284baeda51ce28 (patch)
tree2ac43cbedbcd20f8d6e5cb0be00d4407466cee5c
parente46489991e6306ed5ebdbb3f8e72d21070f1317b (diff)
downloadunicorn-711ca5408415fd3f435d0a36d3284baeda51ce28.tar.gz
Kinda sorta works, still some Markdown => HTML formatting issues
to work out but it gives the site a reasonably consistent look.
-rw-r--r--.document2
-rw-r--r--Documentation/GNUmakefile4
-rw-r--r--GNUmakefile8
3 files changed, 11 insertions, 3 deletions
diff --git a/.document b/.document
index f198e25..a73dbea 100644
--- a/.document
+++ b/.document
@@ -10,3 +10,5 @@ NEWS
 ChangeLog
 lib
 ext/unicorn_http/unicorn_http.c
+unicorn.1
+unicorn_rails.1
diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index 82cc88d..16fcaf0 100644
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -1,7 +1,7 @@
 all::
 
 PANDOC = pandoc
-PANDOC_OPTS = -s -f markdown --email-obfuscation=none --sanitize-html
+PANDOC_OPTS = -f markdown --email-obfuscation=none --sanitize-html
 pandoc = $(PANDOC) $(PANDOC_OPTS)
 pandoc_html = $(pandoc) --toc -t html --no-wrap
 
@@ -24,7 +24,7 @@ install-man: man
 %.1: %.1.txt
         $(pandoc) -t man < $< > $@+ && mv $@+ $@
 %.1.html: %.1.txt
-        $(pandoc_html) -T $(basename $@) < $< > $@+ && mv $@+ $@
+        $(pandoc_html) < $< > $@+ && mv $@+ $@
 
 clean::
         $(RM) $(man1) $(html1)
diff --git a/GNUmakefile b/GNUmakefile
index 4cd7b97..d21d974 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -152,9 +152,15 @@ ChangeLog: GIT-VERSION-FILE
 
 # using rdoc 2.4.1+
 doc: .document $(ext)/unicorn_http.c NEWS ChangeLog
+        > unicorn.1 && > unicorn_rails.1
         rdoc -Na -t "$(shell sed -ne '1s/^= //p' README)"
         install -m644 COPYING doc/COPYING
-        cd doc && ln README.html tmp.html && mv tmp.html index.html
+        $(MAKE) -C Documentation install-html
+        cd doc && for i in unicorn unicorn_rails; do \
+          sed -e '/"documentation">/r man1/'$$i'.1.html' \
+                < $${i}_1.html > tmp && mv tmp $${i}_1.html; done
+        cd doc && ln README.html tmp && mv tmp index.html
+        $(RM) unicorn.1 unicorn_rails.1
 
 rails_git_url = git://github.com/rails/rails.git
 rails_git := vendor/rails.git