[SCM] live-manual branch, debian, updated. debian/2.0_a7-1-13-gc8be1ad

Daniel Baumann daniel at debian.org
Sun Oct 3 18:46:13 UTC 2010


The following commit has been merged in the debian branch:
commit c8be1ad418b75e5871888db36791a1739f14f439
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Oct 3 20:45:48 2010 +0200

    Correcting cp call for sisu-shared directory in install target.

diff --git a/Makefile b/Makefile
index 1a9c3bf..fb66116 100644
--- a/Makefile
+++ b/Makefile
@@ -80,7 +80,6 @@ install:
 		mkdir -p $(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; \
-		cp -a manual/$${LANGUAGE}/build/$${LANGUAGE}/_sisu build/$${LANGUAGE}; \
 		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; \
 		mkdir -p $(DESTDIR)/usr/share/doc/live-manual/txt; \
@@ -92,6 +91,8 @@ install:
 		cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/portrait.letter.pdf $(DESTDIR)/usr/share/doc/live-manual/pdf/live-manual.portrait-letter.$${LANGUAGE}.pdf; \
 	done
 
+	cp -a manual/en/build/en/_sisu $(DESTDIR)/usr/share/doc/live-manual
+
 uninstall:
 	rm -rf $(DESTDIR)/usr/share/doc/live-manual
 

-- 
live-manual



More information about the debian-live-changes mailing list