[SCM] live-manual branch, debian-next, updated. debian/3.0_a9-1-35-g178fe2a

[Ben Armstrong]

The following commit has been merged in the debian-next branch:
commit 178fe2aa21cd5536126ba2d5afd39311d32d2cdc
Author: Ben Armstrong <synrg at debian.org>
Date:   Sun Jan 29 11:25:04 2012 -0400

    Reinstate html format postprocessing; remove redundant sisu manifest run.

diff --git a/Makefile b/Makefile
index f59f289..28dcf0b 100644
--- a/Makefile
+++ b/Makefile
@@ -37,17 +37,19 @@ build: clean
 	do \
 		for FORMAT in $(FORMATS); \
 		do \
-		cd $(CURDIR)/manual; \
-		sisu-$${FORMAT} -v $${LANGUAGE}/live-manual.ssm; \
+			cd $(CURDIR)/manual; \
+			sisu-$${FORMAT} -v $${LANGUAGE}/live-manual.ssm; \
+			if [ "$${FORMAT}" = "html" ] ; \
+			then \
+			    for FILE in ../build/manual/html/*.$${LANGUAGE}.html ../build/manual/html/live-manual/*.$${LANGUAGE}.html; \
+			    do \
+				    bin/fix-sisu-html.rb $${FILE}; \
+				    ([ $(DEBUG) -gt 0 ] || rm -f $${FILE}~); \
+			    done; \
+			fi ; \
 		done; \
 	done; \
-	sisu --manifest -v $${LANGUAGE}/live-manual.ssm
 
-#               for FILE in build/manual/live-manual/*.$${LANGUAGE}.html; \
-#		do \
-#			../bin/fix-sisu-html.rb $${FILE}; \
-#			([ $(DEBUG) -gt 0 ] || rm -f $${FILE}~); \
-#		done; \
 
 autobuild: build	
 	

-- 
live-manual