X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile;h=9fc7829bf9b7584e756d3a68133ed59ff7c037e3;hb=994fd8c3bb5af52b2aad232f5738f5f6fcaf34cf;hp=c3e2a14eccaaea670b0fc098f0b8e0a608aa6280;hpb=ec97ee80125a4dc2d1fadfa51528da037ac480d8;p=developers-reference.git

diff --git a/Makefile b/Makefile
index c3e2a14..9fc7829 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,14 @@
 # Makefile, used for the DDP manuals.sgml area
 
-export PATH:=../quick-reference/bin/:${PATH}
-
 MANUAL		:= $(notdir $(shell pwd))
 PUBLISHDIR	:= /org/www.debian.org/www/doc/manuals
 
 SOURCES		:= $(wildcard *.sgml)
 
-TARGETS		:= $(foreach fmt,html txt ps pdf,developers-reference.$(fmt)) \
-		     $(foreach langext,.fr .ja, \
-		       $(foreach fmt,html txt ps pdf,developers-reference$(langext).$(fmt)))
+TARGETS		:= $(foreach fmt,html txt pdf,developers-reference.$(fmt)) \
+		     $(filter-out developers-reference.ja.pdf, \
+		       $(foreach langext,.fr, \
+		         $(foreach fmt,html txt,developers-reference$(langext).$(fmt))))
 
 # programs for creating output
 DEBIANDOC2HTML	:= debiandoc2html -c
@@ -18,6 +17,9 @@ DEBIANDOC2LATEX	:= debiandoc2latex
 DEBIANDOC2PS	:= debiandoc2latexps
 DEBIANDOC2PDF	:= debiandoc2latexpdf
 
+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
 
@@ -38,39 +40,49 @@ publish:	all
 	[ -d $(PUBLISHDIR) ] || exit 1
 	rm -f $(PUBLISHDIR)/$(MANUAL)/*.html
 	$(make_directory) $(PUBLISHDIR)/$(MANUAL)
-	$(install_file) developers-reference*.html/*.html	\
+	$(install_file) developers-reference*.html/*.html developers-reference*pdf	\
 	   $(PUBLISHDIR)/$(MANUAL)
 
 developers-reference.html:	developers-reference.sgml
-	$(DEBIANDOC2HTML) -l C $<
+	$(htmllink)
+	$(DEBIANDOC2HTML) -l en $<
 
 developers-reference.html/*:	developers-reference.html
 
 developers-reference.%.html:	developers-reference.%.sgml
+	$(htmllink)
 	$(DEBIANDOC2HTML) -l $* $<
 
 developers-reference.txt:	developers-reference.sgml
-	$(DEBIANDOC2TEXT) -l C -O $< > $@
+	$(nohtmllink)
+	$(DEBIANDOC2TEXT) -l en -O $< > $@
 
 developers-reference.%.txt:	developers-reference.%.sgml
+	$(nohtmllink)
 	$(DEBIANDOC2TEXT) -l $* -O $< > $@
 
 developers-reference.tex:	developers-reference.sgml
-	$(DEBIANDOC2LATEX) -l C -O $< > $@
+	$(nohtmllink)
+	$(DEBIANDOC2LATEX) -l en -O $< > $@
 
 developers-reference.%.tex:	developers-reference.%.sgml
+	$(nohtmllink)
 	$(DEBIANDOC2LATEX) -l $* -O $< > $@
 
 developers-reference.ps:        developers-reference.sgml
-	$(DEBIANDOC2PS) -l C $<
+	$(nohtmllink)
+	$(DEBIANDOC2PS) -l en $<
 
 developers-reference.%.ps:      developers-reference.%.sgml
+	$(nohtmllink)
 	$(DEBIANDOC2PS) -l $* $<
 
 developers-reference.pdf:       developers-reference.sgml
-	$(DEBIANDOC2PDF) -l C $<
+	$(nohtmllink)
+	$(DEBIANDOC2PDF) -l en $<
 
 developers-reference.%.pdf:     developers-reference.%.sgml
+	$(nohtmllink)
 	$(DEBIANDOC2PDF) -l $* $<
 
 version.ent:	debian/changelog