[SCM] live-manual branch, debian, updated. debian/2.0_a7-1-3-g6699a55

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit 25229f46fa744ca6e6007b64e59f5bb4c5b977fc
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Oct 3 10:34:35 2010 +0200

    Merging single html output into html output directory.

diff --git a/Makefile b/Makefile
index ae63405..fa1ec09 100644
--- a/Makefile
+++ b/Makefile
@@ -38,8 +38,7 @@ autobuild: clean build
 		cp manual/$${LANGUAGE}/build/$${LANGUAGE}/epub/live-manual.epub build/$${LANGUAGE}/epub; \
 		mkdir -p build/$${LANGUAGE}/html; \
 		cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/[0-9]*.html manual/$${LANGUAGE}/build/$${LANGUAGE}/index.html build/$${LANGUAGE}/html; \
-		mkdir -p build/$${LANGUAGE}/html-single; \
-		cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/doc.html build/$${LANGUAGE}/html-single/live-manual.html; \
+		cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/doc.html build/$${LANGUAGE}/html/live-manual.html; \
 		mkdir -p build/$${LANGUAGE}/odf; \
 		cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/opendocument.odt build/$${LANGUAGE}/odf/live-manual.odt; \
 		mkdir -p build/$${LANGUAGE}/pdf; \

-- 
live-manual