X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=docs%2FMakefile;h=9771ab22f6a829d75abe19530b8c2636e0d25abb;hp=4fb6d5e768e951ad6aa38fb0e50bec95e9b2e587;hb=cd6eea7f0f5d029f40d1aff1af62b78f82abbd06;hpb=f3a39c0e8073ead55cdcec7fba806249c8140b75

diff --git a/docs/Makefile b/docs/Makefile
index 4fb6d5e..9771ab2 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -1,29 +1,26 @@
 all: doc
 
-# doc: doc_man doc_html
-doc: doc_html
+doc: doc_man doc_html
 
 doc_html: html-stamp
 
-html-stamp: grml-live.txt
-	asciidoc -b xhtml11 grml-live.txt
+html-stamp: grml-live.txt grml-live-remaster.txt
+	asciidoc -b xhtml11 -a icons -a toc -a numbered grml-live.txt
+	asciidoc -b xhtml11 -a icons grml-live-remaster.txt
 	touch html-stamp
 
 doc_man: man-stamp
 
-man-stamp: grml-live.txt
+man-stamp: grml-live.txt grml-live-remaster.txt
 	asciidoc -d manpage -b docbook grml-live.txt
-	sed -i 's/<emphasis role="strong">/<emphasis role="bold">/' grml-live.xml
 	xsltproc /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl grml-live.xml
-	# ugly hack to avoid duplicate empty lines in manpage
-	# notice: docbook-xsl 1.71.0.dfsg.1-1 is broken! make sure you use 1.68.1.dfsg.1-0.2!
-	cp grml-live.8 grml-live.8.tmp
-	uniq grml-live.8.tmp > grml-live.8
-	rm grml-live.8.tmp
+	asciidoc -d manpage -b docbook grml-live-remaster.txt
+	xsltproc /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl grml-live-remaster.xml
 	touch man-stamp
 
+online: doc_html
+	scp grml-live.html grml:/var/www/grml/grml-live/index.html
+
 clean:
+	rm -rf grml-live-remaster.html grml-live-remaster.xml grml-live-remaster.8
 	rm -rf grml-live.html grml-live.xml grml-live.8 html-stamp man-stamp
-
-online:
-	scp grml-live.html grml:/var/www/grml/grml-live/index.html