Merge branch 'maint'

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
 <<

make/otp.mk.in

@@ -139,7 +139,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) $<
@@ -239,7 +239,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 = \
@@ -327,5 +327,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 $@