svn commit - mysqldoc@docsrva: r5707 - trunk/make.d

[mcbrown]

Author: mcbrown
Date: 2007-04-03 13:16:54 +0200 (Tue, 03 Apr 2007)
New Revision: 5707

Log:
Simplifying the PDF multibyte build rules



Modified:
   trunk/make.d/xml-pdf-multibyte


Modified: trunk/make.d/xml-pdf-multibyte
===================================================================
--- trunk/make.d/xml-pdf-multibyte	2007-04-03 11:09:48 UTC (rev 5706)
+++ trunk/make.d/xml-pdf-multibyte	2007-04-03 11:16:54 UTC (rev 5707)
Changed blocks: 3, Lines Added: 4, Lines Deleted: 9; 1418 bytes

@@ -26,7 +26,7 @@
 # the TOC numbering will begin at chapter one and cross-references may be
 # inaccurate.
 
-%.a4.fo: %-prepped.xml $(MYSQL_FO_XSL_DEPS) $(STRIP_REMARKS_XSL_DEPS)
+%.a4.fo: %-prepped.xml $(MYSQL_FO_MULTIBYTE_XSL_DEPS) $(STRIP_REMARKS_XSL_DEPS)
 	$(XSLTPROC) \
 		--output - $(STRIP_REMARKS_XSL) $< \
 	| $(XSLTPROC) \

@@ -35,7 +35,7 @@
 		--output $@-tmp $(MYSQL_FO_MULTIBYTE_XSL) -
 	mv $@-tmp $@
 
-%.fo: %-prepped.xml $(MYSQL_FO_XSL_DEPS) $(STRIP_REMARKS_XSL_DEPS)
+%.fo: %-prepped.xml $(MYSQL_FO_MULTIBYTE_XSL_DEPS) $(STRIP_REMARKS_XSL_DEPS)
 	$(XSLTPROC) \
 		--output - $(STRIP_REMARKS_XSL) $< \
 	| $(XSLTPROC) \

@@ -46,13 +46,8 @@
 # We do NOT need to do the multibyte transform on non-roman characters if we 
 # are using a full multibyte character set
 
-%.pdf: %.fo
-	if [ -f $(FOP_MULTIBYTE_CONFIG) ]; then \
-		fop -q -c $(FOP_MULTIBYTE_CONFIG) $< $*.pdf-tmp > $*.pdf-err; \
-	else \
-		echo "Cannot build multibyte PDF without font specification in $(FOP_MULTIBYTE_CONFIG)\n"; \
-		exit 1
-	fi
+%.pdf: %.fo $(FOP_MULTIBYTE_CONFIG)
+	fop -q -c $(FOP_MULTIBYTE_CONFIG) $< $*.pdf-tmp > $*.pdf-err
 	mv $*.pdf-tmp $*.pdf
 	sed -e '/hyphenation/d' < $*.pdf-err
 	$(RM) $*.pdf-err