fix dynamic pdf-link

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

diff --git a/Makefile b/Makefile
index c14e1e833cdac2a29e34f11c780a86c23818b425..390648d434fb9220a6d59593a22bf96d016686db 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,9 +17,8 @@ DEBIANDOC2LATEX       := debiandoc2latex
 DEBIANDOC2PS   := debiandoc2latexps
 DEBIANDOC2PDF  := debiandoc2latexpdf
 
-# this hint is for adding a link to the pdf version
-add_pdf_link   := patch -p0 < add_pdf_link.diff
-remove_pdf_link        := patch -p0 -R < add_pdf_link.diff
+htmllink       := echo "<!entity % htmltext \"INCLUDE\">" > dynamic.ent
+nohtmllink     := echo "<!entity % htmltext \"IGNORE\">" > dynamic.ent
 
 make_directory := install -d -m 755
 install_file   := install -m 644 -p
@@ -45,37 +44,45 @@ publish:    all
           $(PUBLISHDIR)/$(MANUAL)
 
 developers-reference.html:     developers-reference.sgml
-       $(add_pdf_link)
+       $(htmllink)
        $(DEBIANDOC2HTML) -l en $<
-       $(remove_pdf_link)
 
 developers-reference.html/*:   developers-reference.html
 
 developers-reference.%.html:   developers-reference.%.sgml
+       $(htmllink)
        $(DEBIANDOC2HTML) -l $* $<
 
 developers-reference.txt:      developers-reference.sgml
+       $(nohtmllink)
        $(DEBIANDOC2TEXT) -l en -O $< > $@
 
 developers-reference.%.txt:    developers-reference.%.sgml
+       $(nohtmllink)
        $(DEBIANDOC2TEXT) -l $* -O $< > $@
 
 developers-reference.tex:      developers-reference.sgml
+       $(nohtmllink)
        $(DEBIANDOC2LATEX) -l en -O $< > $@
 
 developers-reference.%.tex:    developers-reference.%.sgml
+       $(nohtmllink)
        $(DEBIANDOC2LATEX) -l $* -O $< > $@
 
 developers-reference.ps:        developers-reference.sgml
+       $(nohtmllink)
        $(DEBIANDOC2PS) -l en $<
 
 developers-reference.%.ps:      developers-reference.%.sgml
+       $(nohtmllink)
        $(DEBIANDOC2PS) -l $* $<
 
 developers-reference.pdf:       developers-reference.sgml
+       $(nohtmllink)
        $(DEBIANDOC2PDF) -l en $<
 
 developers-reference.%.pdf:     developers-reference.%.sgml
+       $(nohtmllink)
        $(DEBIANDOC2PDF) -l $* $<
 
 version.ent:   debian/changelog

diff --git a/add_pdf_link.diff b/add_pdf_link.diff
deleted file mode 100644 (file)
index c828bdb..0000000
--- a/add_pdf_link.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: developers-reference.sgml
-===================================================================
-RCS file: /org/cvs.debian.org//cvs/debian-doc/ddp/manuals.sgml/developers-reference/developers-reference.sgml,v
-retrieving revision 1.257
-diff -u -r1.257 developers-reference.sgml
---- developers-reference.sgml  26 Jan 2005 09:21:37 -0000      1.257
-+++ developers-reference.sgml  1 Feb 2005 19:44:23 -0000
-@@ -52,6 +52,11 @@
- the &debian-formal; distribution or on the World Wide Web at <url
- id="&url-gpl;" name="the GNU web site">.  You can also obtain it by
- writing to the &fsf-addr;.
-+<!-- BEGIN-PDFLINK -->
-+       <p>
-+If you want to print this reference, you should use the <url
-+id="&url-pdf-reference;" name="pdf version">.
-+<!-- END-PDFLINK -->
- 
-     <toc detail="sect1">
- 

diff --git a/developers-reference.sgml b/developers-reference.sgml
index 33baa4bdac96b9962f3e2d33a053e994ab3d614d..22054e65c24406ac490746e573094ce10592dee4 100644 (file)
--- a/developers-reference.sgml
+++ b/developers-reference.sgml
@@ -4,9 +4,10 @@
   <!ENTITY % versiondata SYSTEM "version.ent"> %versiondata;
   <!-- common, language independent entities -->
   <!ENTITY % commondata  SYSTEM "common.ent" > %commondata;
+  <!ENTITY % dynamicdata  SYSTEM "dynamic.ent" > %dynamicdata;
 
   <!-- CVS revision of this document -->
-  <!ENTITY cvs-rev "$Revision: 1.258 $">
+  <!ENTITY cvs-rev "$Revision: 1.259 $">
 
   <!-- if you are translating this document, please notate the CVS
        revision of the original developer's reference in cvs-en-rev -->
@@ -53,6 +54,12 @@ the &debian-formal; distribution or on the World Wide Web at <url
 id="&url-gpl;" name="the GNU web site">.  You can also obtain it by
 writing to the &fsf-addr;.
 
+<![ %htmltext [
+       <p>
+If you want to print this reference, you should use the <url
+id="developers-reference.pdf" name="pdf version">.
+]]>
+
     <toc detail="sect1">
 
     <chapt id="scope">Scope of This Document