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

diff --git a/Makefile b/Makefile
index b6b0757..9fc7829 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,14 @@
 # Makefile, used for the DDP manuals.sgml area
 
 MANUAL		:= $(notdir $(shell pwd))
-PUBLISHDIR := /org/www.debian.org/www/doc/manuals
+PUBLISHDIR	:= /org/www.debian.org/www/doc/manuals
 
 SOURCES		:= $(wildcard *.sgml)
 
 TARGETS		:= $(foreach fmt,html txt pdf,developers-reference.$(fmt)) \
 		     $(filter-out developers-reference.ja.pdf, \
-		       $(foreach langext,.ja, \
-		         $(foreach fmt,html txt pdf,developers-reference$(langext).$(fmt))))
+		       $(foreach langext,.fr, \
+		         $(foreach fmt,html txt,developers-reference$(langext).$(fmt))))
 
 # programs for creating output
 DEBIANDOC2HTML	:= debiandoc2html -c
@@ -17,13 +17,20 @@ 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
 
 MAX_TEX_RECURSION := 5
 
-.PHONY:	all
-all:    $(TARGETS)
+.PHONY:	all dropold
+all:    $(TARGETS) dropold
+
+dropold:
+	-rm -rf developers-reference.ja.html
+
 
 .PHONY: validate
 validate:	$(addsuffix .validate,$(SOURCES))
@@ -33,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
@@ -77,11 +94,14 @@ version.ent:	debian/changelog
 
 USERMAP	:= ../../ddp/CVSROOT/users
 .PHONY: prepare
-prepare:
+prepare:	ChangeLog
+	cvs ci -m "update for next release" ChangeLog
+
+.PHONY: ChangeLog
+ChangeLog:
 	@[ -f CVS/Root -a -f $(USERMAP) ] || \
-		( echo "silly rabbit, prepare is for Adam" 1>&2; exit 1 )
+		( echo "usermap file '$(USERMAP)' not found" 1>&2; exit 1 )
 	cvs2cl -r --usermap $(USERMAP)
-	cvs ci -m "update for next release" ChangeLog
 
 .PHONY: clean
 clean: