Browse code

Bug 20739: Use one manual for all platforms

Arthur Edelstein authored on 17/01/2017 23:19:57
Showing 1 changed files
... ...
@@ -8,7 +8,6 @@ TOR_AND_HTTPS = ../tor-and-https
8 8
 HELP_ID = tor-browser-user-manual
9 9
 HELP_FILES = $(shell cd $(srcdir)/C && git ls-files '*.page')
10 10
 HELP_MEDIA = $(shell cd $(srcdir)/C && git ls-files 'media')
11
-HELP_PLATFORMS = windows macosx linux
12 11
 HELP_LINGUAS = en-US @TOR_BROWSER_BUNDLE_LOCALES@
13 12
 
14 13
 .PHONY: html
... ...
@@ -20,13 +19,10 @@ html: all media-symlinks.stamp
20 19
 				mkdir -p $$(dirname $$file); \
21 20
 				ln -nsf ../$$file $$lc/$$(basename $$file); \
22 21
 			done; \
23
-			for platform in $(HELP_PLATFORMS); do \
24
-				mkdir -p html/$$platform/$$lc; \
25
-				yelp-build html -x $(srcdir)/platform-$$platform.xslt \
26
-						-o html/$$platform/$$lc $$lc; \
27
-				for ttf in $$lc/media/*.ttf; do \
28
-					cp --preserve=timestamps $$ttf html/$$platform/$$lc/media; \
29
-				done; \
22
+			mkdir -p html/$$lc; \
23
+			yelp-build html -o html/$$lc $$lc; \
24
+			for ttf in $$lc/media/*.ttf; do \
25
+				cp --preserve=timestamps $$ttf html/$$lc/media; \
30 26
 			done; \
31 27
 		done
32 28
 
... ...
@@ -34,16 +30,14 @@ html: all media-symlinks.stamp
34 30
 pdf: all media-symlinks.stamp
35 31
 	set -e && \
36 32
 		for lc in $(HELP_LINGUAS); do \
37
-			for platform in $(HELP_PLATFORMS); do \
38
-				PDF_DIR=pdf/$$platform/$$lc; \
39
-				LATEX_FILE=$(HELP_ID)-$$lc.latex; \
40
-				mkdir -p $$PDF_DIR; \
41
-				yelp-build cache -o $$PDF_DIR/index.cache $$lc; \
42
-				xsltproc --xinclude \
43
-					$(MAL2LATEX)/mal2latex.xsl $$PDF_DIR/index.cache \
44
-					> $$PDF_DIR/$$LATEX_FILE; \
45
-				(cd $$PDF_DIR && lualatex $$LATEX_FILE); \
46
-			done; \
33
+			PDF_DIR=pdf/$$lc; \
34
+			LATEX_FILE=$(HELP_ID)-$$lc.latex; \
35
+			mkdir -p $$PDF_DIR; \
36
+			yelp-build cache -o $$PDF_DIR/index.cache $$lc; \
37
+			xsltproc --xinclude \
38
+				$(MAL2LATEX)/mal2latex.xsl $$PDF_DIR/index.cache \
39
+				> $$PDF_DIR/$$LATEX_FILE; \
40
+			(cd $$PDF_DIR && lualatex $$LATEX_FILE); \
47 41
 		done;
48 42
 
49 43
 media-symlinks.stamp: