[SCM] live-manual branch, debian, updated. debian/2.0_a7-1-9-g01b63ff

Daniel Baumann daniel at debian.org
Sun Oct 3 11:05:00 UTC 2010


The following commit has been merged in the debian branch:
commit 01b63ff5bc16a10b184002449ec7cf0c400f36aa
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Oct 3 13:05:28 2010 +0200

    Correcting wrong path to the html multipage index in build targets.

diff --git a/Makefile b/Makefile
index 19cb7fa..431af97 100644
--- a/Makefile
+++ b/Makefile
@@ -38,7 +38,7 @@ autobuild: clean build
 		mkdir -p build/$${LANGUAGE}/epub; \
 		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; \
+		cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/[0-9]*.html manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/index.html build/$${LANGUAGE}/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; \
@@ -77,7 +77,7 @@ install:
 		mkdir -p $(DESTDIR)/usr/share/doc/live-manual/epub; \
 		cp manual/$${LANGUAGE}/build/$${LANGUAGE}/epub/live-manual.epub $(DESTDIR)/usr/share/doc/live-manual/epub/live-manual.$${LANGUAGE}.epub; \
 		mkdir -p $(DESTDIR)/usr/share/doc/live-manual/html/$${LANGUAGE}; \
-		cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/[0-9]*.html manual/$${LANGUAGE}/build/$${LANGUAGE}/index.html $(DESTDIR)/usr/share/doc/live-manual/html/$${LANGUAGE}; \
+		cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/[0-9]*.html manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/index.html $(DESTDIR)/usr/share/doc/live-manual/html/$${LANGUAGE}; \
 		cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/doc.html $(DESTDIR)/usr/share/doc/live-manual/html/live-manual.$${LANGUAGE}.html; \
 		mkdir -p $(DESTDIR)/usr/share/doc/live-manual/odf; \
 		cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/opendocument.odt $(DESTDIR)/usr/share/doc/live-manual/odf/live-manual.$${LANGUAGE}.odt; \

-- 
live-manual



More information about the debian-live-changes mailing list