[SCM] Debian Live manual branch, master, updated. 9059018de36839e317afae7de4c0ac233d44f1b5

Daniel Baumann daniel at debian.org
Sat Jan 24 12:35:27 UTC 2009


The following commit has been merged in the master branch:
commit 9059018de36839e317afae7de4c0ac233d44f1b5
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Jan 24 13:34:46 2009 +0100

    Moving build-index.html into the html folder.

diff --git a/Makefile b/Makefile
index 31fbea4..cd66790 100644
--- a/Makefile
+++ b/Makefile
@@ -10,17 +10,17 @@ build: clean all
 		cp *.$$FORMAT $(AUTOBUILD)/$$FORMAT; \
 	done
 
-	sed '{s/@DATE@/$(shell LC_ALL=C date -R)/;s%/@LANG@%%;}' build-index.html.in > $(AUTOBUILD)/index.html.en
+	sed '{s/@DATE@/$(shell LC_ALL=C date -R)/;s%/@LANG@%%;}' html/index.html.in > $(AUTOBUILD)/index.html.en
 
 	set -e; for LANGUAGE in $(LANGUAGES); do \
 		for FORMAT in $(FORMATS); do \
 			mkdir -p $(AUTOBUILD)/$$FORMAT/$$LANGUAGE; \
 			cp $$LANGUAGE/*.$$FORMAT $(AUTOBUILD)/$$FORMAT/$$LANGUAGE; \
 		done; \
-		sed "{s/@DATE@/$(shell LC_ALL=C date -R)/;s/@LANG@/$$LANGUAGE/;}" $$LANGUAGE/build-index.html.in > $(AUTOBUILD)/index.html.$$LANGUAGE; \
+		sed "{s/@DATE@/$(shell LC_ALL=C date -R)/;s/@LANG@/$$LANGUAGE/;}" $$LANGUAGE/html/index.html.in > $(AUTOBUILD)/index.html.$$LANGUAGE; \
 	done
 
-	cp css/* $(AUTOBUILD)
+	cp html/* $(AUTOBUILD)
 
 po4a:
 	po4a -k 0 po4a/live-manual.cfg;
diff --git a/css/favicon.ico b/html/favicon.ico
similarity index 100%
rename from css/favicon.ico
rename to html/favicon.ico
diff --git a/css/image.png b/html/image.png
similarity index 100%
rename from css/image.png
rename to html/image.png
diff --git a/build-index.html.in b/html/index.html.in
similarity index 100%
rename from build-index.html.in
rename to html/index.html.in
diff --git a/css/stylesheet.css b/html/stylesheet.css
similarity index 100%
rename from css/stylesheet.css
rename to html/stylesheet.css

-- 
Debian Live manual



More information about the debian-live-changes mailing list