Use dblatex instead of fop, as long fop is in contrib.

git-svn-id: svn://anonscm.debian.org/ddp/developers-reference/trunk@4933 313b444b-1b9f-4f58-a734-7bb04f332e8d

diff --git a/Makefile b/Makefile
index cb6924cb1ef49cc0b0b95c68658932117c6a444e..230bd6479705dfbe7617df028ce2af59022068ff 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -18,13 +18,14 @@ PUBDATE=unknown
 # programs for creating output
 XP=xsltproc --nonet --novalid --xinclude
 XL=xmllint --nonet --noout --postvalid --xinclude
-# fop is currently in contrib, but can go to main, see #366783
+# dblatex 0.2.8 has some problems (e.g. #465221), but we can
+# live with that for now (but: Japanese PDF seems to need
+# non-free cyberbit font.)
 # Alternatives:
-# - dblatex (0.2.6 has some problems, next release will be OK;
-#   Japanese PDF needs non-free cyberbit font)
 # - docbook2pdf (seems to die on UTF-8, #431085); and
+# - fop is currently in contrib, but can go to main, see #366783
 # - xmlroff (not mature enough, #182445)
-FOP=fop
+DBLATEX=dblatex --style=db2latex
 # The "--keep 0" should be removed as soon as the translations are ready
 TRANSLATE=po4a-translate --format docbook --keep 0
 
@@ -39,8 +40,6 @@ DBK2HTML=--stringparam chunk.section.depth 0 \
 # all in one file
 DBK2HTML1=--stringparam section.autolabel 1 \
     $(DOCBOOK_XSL)/xhtml/docbook.xsl
-DBK2FO=$$TOP/fop.xsl
-#    $(DOCBOOK_XSL)/fo/docbook.xsl
 
 .PHONY:        all
 all:    $(TARGETS)
@@ -73,7 +72,7 @@ else
 $(LINGUA)/%.dbk:       %.dbk $(patsubst %.dbk,po4a/$(LINGUA)/%.po,%.dbk)
        $(TRANSLATE) -m $< -p po4a/$(@:.dbk=.po) -l $@
 
-$(LINGUA)/%.ent:       %.ent
+$(LINGUA)/common.ent:  common.ent
        cd $(@D) && ln -sf ../$(@F) .
 endif
 
@@ -82,15 +81,10 @@ developers-reference.txt:   $(PWD)/developers-reference.txt
        $(XP) $(DBK2HTML1) $(@D)/index.dbk \
            | w3m -cols 65 -dump -T text/html > $@
 
-developers-reference.fo:       $(PWD)/developers-reference.fo
-       @true
-
-%/developers-reference.fo:     $(addprefix %/,$(SOURCES)) fop.xsl
-       TOP=`pwd` && cd $(@D) && $(XP) $(DBK2FO) index.dbk > $(@F)
-
 developers-reference.pdf:       $(PWD)/developers-reference.pdf
-%/developers-reference.pdf:     %/developers-reference.fo
-       $(FOP) -fo $< -pdf $@
+%/developers-reference.pdf:     $(addprefix %/,$(SOURCES))
+       TOP=`pwd` && cd $(@D) && $(DBLATEX) index.dbk \
+           && mv index.dbk.pdf $(@F)
 
 .PHONY: pot
 pot:                           $(patsubst %.dbk,po4a/po/%.pot,$(SOURCES))
@@ -104,7 +98,7 @@ po4a/$(LINGUA)/%.po:         %.dbk
        po4a-updatepo --format docbook --master $< --po $@
 endif
 
-version.ent:
+%/version.ent:
        echo '<!ENTITY version "$(VERSION)">' >  $@
        echo '<!ENTITY pubdate "$(PUBDATE)">' >> $@