1.1 --- a/Makefile	Mon Mar 30 16:23:33 2009 +0800
     1.2 +++ b/Makefile	Mon Mar 30 21:36:31 2009 +0800
     1.3 @@ -1,6 +1,7 @@
     1.4  #
     1.5  # Makefile for the hgbook, top-level
     1.6  #
     1.7 +include Makefile.vars
     1.8  
     1.9  FORMATS=html html-single pdf
    1.10  
    1.11 @@ -8,11 +9,11 @@
    1.12  DBK_LANGUAGES := en
    1.13  LANGUAGES := $(DBK_LANGUAGES) $(PO_LANGUAGES)
    1.14  
    1.15 -UPDATEPO = PERLLIB=../tools/po4a/lib/ ../tools/po4a/po4a-updatepo -M UTF-8 \
    1.16 +UPDATEPO = PERLLIB=$(PO4A_LIB) $(PO4A_HOME)/po4a-updatepo -M UTF-8 \
    1.17  	   -f docbook -o doctype='docbook' -o includeexternal \
    1.18  	   -o nodefault='<programlisting> <screen>' \
    1.19  	   -o untranslated='<programlisting> <screen>'
    1.20 -TRANSLATE = PERLLIB=tools/po4a/lib/ tools/po4a/po4a-translate -M UTF-8 \
    1.21 +TRANSLATE = PERLLIB=$(PO4A_LIB) $(PO4A_HOME)/po4a-translate -M UTF-8 \
    1.22  	   -f docbook -o doctype='docbook' \
    1.23  	   -k 0
    1.24  
    1.25 @@ -150,6 +151,7 @@
    1.26  
    1.27  build/$(LINGUA)/source/hgbook.xml: build/en/source/hgbook.xml po/$(LINGUA).po $(images)
    1.28  	mkdir -p build/$(LINGUA)/source/figs
    1.29 +	cp en/figs/*.png build/$(LINGUA)/source/figs
    1.30  	$(TRANSLATE) -m build/en/source/hgbook.xml -p po/$(LINGUA).po -l $@.tmp
    1.31  	cat $@.tmp | sed 's/\$$rev_id\$$/${rev_id}/' > $@
    1.32  endif
    1.33 @@ -198,7 +200,7 @@
    1.34  
    1.35  build/$(LINGUA)/pdf/hgbook.pdf: build/$(LINGUA)/source/hgbook.xml stylesheets/fo.xsl stylesheets/$(LINGUA)/fo.xsl
    1.36  	mkdir -p build/$(LINGUA)/pdf
    1.37 -	java -classpath tools/fop/lib/saxon65.jar:tools/fop/lib/saxon65-dbxsl.jar:tools/fop/lib/xml-commons-resolver-1.2.jar:tools/fop/conf \
    1.38 +	java -classpath $(JAVA_SHARE)/saxon65.jar:$(JAVA_SHARE)/saxon65-dbxsl.jar:$(JAVA_SHARE)/xml-commons-resolver-1.2.jar:$(JAVA_SHARE) \
    1.39  	    com.icl.saxon.StyleSheet \
    1.40  	    -x org.apache.xml.resolver.tools.ResolvingXMLReader \
    1.41  	    -y org.apache.xml.resolver.tools.ResolvingXMLReader \
    1.42 @@ -208,7 +210,7 @@
    1.43  	    stylesheets/$(LINGUA)/fo.xsl \
    1.44  	    fop1.extensions=1
    1.45  
    1.46 -	(cd build/$(LINGUA)/source && ../../../tools/fop/fop.sh hgbook.fo ../pdf/hgbook.pdf)
    1.47 +	(cd build/$(LINGUA)/source && $(FOP_HOME)/fop.sh hgbook.fo ../pdf/hgbook.pdf)
    1.48  endif
    1.49  
    1.50  en/figs/%.png: en/figs/%.svg en/fixsvg