aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Thorsen <[email protected]>2017-09-21 09:14:33 +0200
committerLars Thorsen <[email protected]>2017-09-21 09:14:33 +0200
commitbb94c48b5e43bb4673794ca83d00e2091750e707 (patch)
tree0a4f6c20580125909ce712f55661d070ffcc9c5a
parentf150c21029477836fb4b533ee02290d5b6bcc818 (diff)
parent9c8ea039658153ae6b7046ac97ff705ef80a8dbe (diff)
downloadotp-bb94c48b5e43bb4673794ca83d00e2091750e707.tar.gz
otp-bb94c48b5e43bb4673794ca83d00e2091750e707.tar.bz2
otp-bb94c48b5e43bb4673794ca83d00e2091750e707.zip
Merge branch 'lars/make/fop-font-cache/OTP-14622' into maint
* lars/make/fop-font-cache/OTP-14622: Change number of parameters Fix fop font-cache handling during pdf build
-rwxr-xr-xmake/fakefop18
-rw-r--r--make/otp.mk.in7
2 files changed, 12 insertions, 13 deletions
diff --git a/make/fakefop b/make/fakefop
index 7beeddf0a5..7a34c4faf1 100755
--- a/make/fakefop
+++ b/make/fakefop
@@ -22,13 +22,13 @@
# Author: Tuncer Ayaz
#
-if [ $# -lt 6 ]
+if [ $# -lt 8 ]
then
- echo "Usage: fakefop -c IGNORED -fo IGNORED -pdf OUTFILE"
+ echo "Usage: fakefop -c IGNORED -cache IGNORED -fo IGNORED -pdf OUTFILE"
exit 1
fi
-OUTFILE=$6
+OUTFILE=$8
echo -n -e '%PDF-1.4\n%\0342\0343\0317\0323\n\n' > $OUTFILE
@@ -87,12 +87,12 @@ endobj
xref
0 6
-0000000000 65536 f
-0000000016 00000 n
-0000000070 00000 n
-0000000136 00000 n
-0000000291 00000 n
-0000000410 00000 n
+0000000000 65536 f
+0000000016 00000 n
+0000000070 00000 n
+0000000136 00000 n
+0000000291 00000 n
+0000000410 00000 n
trailer
<<
diff --git a/make/otp.mk.in b/make/otp.mk.in
index 83bab7065d..b06c51d0fb 100644
--- a/make/otp.mk.in
+++ b/make/otp.mk.in
@@ -138,7 +138,7 @@ endif
#
.PRECIOUS: %.erl %.fo
-## Uncomment these lines and add .idl to suffixes above to have erlc
+## Uncomment these lines and add .idl to suffixes above to have erlc
## eat IDL files
##$(EGEN)/%.erl: $(ESRC)/%.idl
## $(ERLC) $(IDL_FLAGS) $<
@@ -238,7 +238,7 @@ ifeq ($(PDFCOLOR),)
PDFCOLOR = \#960003
endif
-# HTML & GIF files that always are generated and must be delivered
+# HTML & GIF files that always are generated and must be delivered
SGML_COLL_FILES = $(SGML_APPLICATION_FILES) $(SGML_PART_FILES)
XML_COLL_FILES = $(XML_APPLICATION_FILES) $(XML_PART_FILES)
DEFAULT_HTML_FILES = \
@@ -326,5 +326,4 @@ $(MAN9DIR)/%.9: %.xml
escript $(DOCGEN)/priv/bin/codeline_preprocessing.escript $< $@
.fo.pdf:
- $(FOP) -c $(FOP_CONFIG) -fo $< -pdf $@
-
+ $(FOP) -c $(FOP_CONFIG) -cache $(ERL_TOP)/make/$(TARGET)/fop-fonts.cache -fo $< -pdf $@