[SCM] live-manual branch, debian, updated. debian/2.0_a4-1-2-gc9917af

Daniel Baumann daniel at debian.org
Mon Sep 6 18:15:38 UTC 2010


The following commit has been merged in the debian branch:
commit c9917af848652ec03124d78b284c9c771fce5711
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Sep 6 20:13:13 2010 +0200

    Updating autobuild target in makefile.

diff --git a/Makefile b/Makefile
index 407ab43..5d496d4 100644
--- a/Makefile
+++ b/Makefile
@@ -30,16 +30,24 @@ build:
 	done
 
 autobuild: clean build
-	rm -f build
-
-	cp html/* build
+	rm -rf build
+	cp -a html build
 
 	for LANGUAGE in $(LANGUAGES); \
 	do \
-		cp html/* build/$${LANGUAGE}; \
+		mkdir -p build/$${LANGUAGE}/html; \
+		cp manual/$${LANGUAGE}/build/$${LANGUAGE}/epub/live-manual.epub build/$${LANGUAGE}; \
+		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/opendocument.odt build/$${LANGUAGE}/live-manual.odt; \
+		cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/doc.html build/$${LANGUAGE}/live-manual.html; \
+		cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/plain.txt build/$${LANGUAGE}/live-manual.txt; \
+		cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/landscape.a4.pdf build/$${LANGUAGE}/live-manual.landscape-a4.pdf; \
+		cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/portrait.a4.pdf build/$${LANGUAGE}/live-manual.portrait-a4.pdf; \
+		cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/landscape.letter.pdf build/$${LANGUAGE}/live-manual.landscape-letter.pdf; \
+		cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/portrait.letter.pdf build/$${LANGUAGE}/live-manual.portrait-letter.pdf; \
 		sed -e "s|@DATE_BUILD@|$(shell LC_ALL=C date -R)|" \
 		    -e "s|@DATE_CHANGE@|$(shell LC_ALL=C git log | grep -m1 Date | awk -FDate: '{ print $2 }' | sed -e 's|^ *||g')|" \
-		build/$${LANGUAGE}/index.html.in > build/$${LANGUAGE}/index.html; \
+		manual/$${LANGUAGE}/index.html.in > build/$${LANGUAGE}/index.html; \
 	done
 
 commit: tidy test
@@ -59,7 +67,6 @@ commit: tidy test
 	@echo "  * git push"
 
 install:
-
 	for LANGUAGE in $(LANGUAGES); \
 	do \
 		mkdir -p $(DESTDIR)/usr/share/doc/live-manual/$${LANGUAGE}/html; \

-- 
live-manual



More information about the debian-live-changes mailing list