[tor-commits] [user-manual/master] Bug 20739: Use one manual for all platforms

[colin at torproject.org]

commit 9f7e9af7673c9a685b23d78670269be3041356b9
Author: Arthur Edelstein <arthuredelstein at gmail.com>
Date:   Tue Jan 17 17:19:57 2017 -0500

    Bug 20739: Use one manual for all platforms
---
 Makefile.am | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index a45aac7..267ee64 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,6 @@ TOR_AND_HTTPS = ../tor-and-https
 HELP_ID = tor-browser-user-manual
 HELP_FILES = $(shell cd $(srcdir)/C && git ls-files '*.page')
 HELP_MEDIA = $(shell cd $(srcdir)/C && git ls-files 'media')
-HELP_PLATFORMS = windows macosx linux
 HELP_LINGUAS = en-US @TOR_BROWSER_BUNDLE_LOCALES@
 
 .PHONY: html
@@ -20,13 +19,10 @@ html: all media-symlinks.stamp
 				mkdir -p $$(dirname $$file); \
 				ln -nsf ../$$file $$lc/$$(basename $$file); \
 			done; \
-			for platform in $(HELP_PLATFORMS); do \
-				mkdir -p html/$$platform/$$lc; \
-				yelp-build html -x $(srcdir)/platform-$$platform.xslt \
-						-o html/$$platform/$$lc $$lc; \
-				for ttf in $$lc/media/*.ttf; do \
-					cp --preserve=timestamps $$ttf html/$$platform/$$lc/media; \
-				done; \
+			mkdir -p html/$$lc; \
+			yelp-build html -o html/$$lc $$lc; \
+			for ttf in $$lc/media/*.ttf; do \
+				cp --preserve=timestamps $$ttf html/$$lc/media; \
 			done; \
 		done
 
@@ -34,16 +30,14 @@ html: all media-symlinks.stamp
 pdf: all media-symlinks.stamp
 	set -e && \
 		for lc in $(HELP_LINGUAS); do \
-			for platform in $(HELP_PLATFORMS); do \
-				PDF_DIR=pdf/$$platform/$$lc; \
-				LATEX_FILE=$(HELP_ID)-$$lc.latex; \
-				mkdir -p $$PDF_DIR; \
-				yelp-build cache -o $$PDF_DIR/index.cache $$lc; \
-				xsltproc --xinclude \
-					$(MAL2LATEX)/mal2latex.xsl $$PDF_DIR/index.cache \
-					> $$PDF_DIR/$$LATEX_FILE; \
-				(cd $$PDF_DIR && lualatex $$LATEX_FILE); \
-			done; \
+			PDF_DIR=pdf/$$lc; \
+			LATEX_FILE=$(HELP_ID)-$$lc.latex; \
+			mkdir -p $$PDF_DIR; \
+			yelp-build cache -o $$PDF_DIR/index.cache $$lc; \
+			xsltproc --xinclude \
+				$(MAL2LATEX)/mal2latex.xsl $$PDF_DIR/index.cache \
+				> $$PDF_DIR/$$LATEX_FILE; \
+			(cd $$PDF_DIR && lualatex $$LATEX_FILE); \
 		done;
 
 media-symlinks.stamp: