X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=developers-reference.git;a=blobdiff_plain;f=Makefile;h=1a49f3946cd29d148f9be5e06295329a5352dd4b;hp=bb365f83e3ac531c1706a38ef07652f7fa24053d;hb=1bd681f99a7b307ebb5e5ab4759e63c7f58675af;hpb=18a530609d141d70eef964278571af8944a04e14

diff --git a/Makefile b/Makefile
index bb365f8..1a49f39 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # Makefile, used for the DDP manuals.sgml area
 
 MANUAL		:= $(notdir $(shell pwd))
-PUBLISHDIR	:= ../../../public_html/manuals.html
+PUBLISHDIR := /org/www.debian.org/www/doc/manuals
 
 SOURCES		:= $(wildcard *.sgml)
 
@@ -14,6 +14,8 @@ TARGETS		:= $(foreach fmt,html txt pdf,developers-reference.$(fmt)) \
 DEBIANDOC2HTML	:= debiandoc2html -c
 DEBIANDOC2TEXT	:= debiandoc2text
 DEBIANDOC2LATEX	:= debiandoc2latex
+DEBIANDOC2PS	:= debiandoc2latexps
+DEBIANDOC2PDF	:= debiandoc2latexpdf
 
 make_directory	:= install -d -m 755
 install_file	:= install -m 644 -p
@@ -37,6 +39,8 @@ publish:	all
 developers-reference.html:	developers-reference.sgml
 	$(DEBIANDOC2HTML) -l C $<
 
+developers-reference.html/*:	developers-reference.html
+
 developers-reference.%.html:	developers-reference.%.sgml
 	$(DEBIANDOC2HTML) -l $* $<
 
@@ -52,32 +56,22 @@ developers-reference.tex:	developers-reference.sgml
 developers-reference.%.tex:	developers-reference.%.sgml
 	$(DEBIANDOC2LATEX) -l $* -O $< > $@
 
-%.pdf:	%.tex
-#	 note that I have seen bi-stable .aux files, thus we check two levels deep
-	-cp -pf prior.aux pprior.aux 2>/dev/null
-	-cp -pf $*.aux prior.aux 2>/dev/null
-#	 fail if we don't have pdflatex correctly installed
-	kpsewhich pdflatex.fmt >/dev/null
-#	 due to a bug in debiandoc2latex2e output, this might fail
-	-pdflatex '\nonstopmode\input{$<}' >/dev/null # see $(@:.pdf=.log) for details
-	@set -e								;\
-	if ! cmp $*.aux prior.aux 2>/dev/null &&		\
-	   ! cmp $*.aux pprior.aux 2>/dev/null; then	\
-		if expr $(MAKELEVEL) '<' $(MAX_TEX_RECURSION) >/dev/null;\
-		then							\
-		   echo "remaking $@ (take $(MAKELEVEL))"		;\
-		   rm -f $@						;\
-		   $(MAKE) $@						;\
-		else							\
-		   echo "E: $@ needs remaking, but we have reached max. level, $(MAX_TEX_RECURSION)" ;\
-		fi							\
-	fi
-	rm -f prior.aux pprior.aux
+developers-reference.ps:        developers-reference.sgml
+	$(DEBIANDOC2PS) -l C $<
+
+developers-reference.%.ps:      developers-reference.%.sgml
+	$(DEBIANDOC2PS) -l $* $<
+
+developers-reference.pdf:       developers-reference.sgml
+	$(DEBIANDOC2PDF) -l C $<
+
+developers-reference.%.pdf:     developers-reference.%.sgml
+	$(DEBIANDOC2PDF) -l $* $<
 
 version.ent:	debian/changelog
 	./debian/rules $@
 
-%.validate : %
+%.validate : % version.ent
 	nsgmls -wall -gues $<
 	touch $@
 
@@ -97,7 +91,8 @@ clean:
 	      developers-reference*.sasp* developers-reference*.tex \
 	      developers-reference*.aux developers-reference*.toc \
 	      developers-reference*.idx developers-reference*.log \
-	      developers-reference*.out developers-reference*.dvi
+	      developers-reference*.out developers-reference*.dvi \
+	      developers-reference*.tpt
 	rm -f version.ent
 	rm -f `find . -name "*~" -o -name "*.bak"`
 	rm -f *.validate
@@ -110,3 +105,6 @@ distclean: clean
 developers-reference$(SRCEXT).sgml: version.ent common.ent
 
 html: $(MANUAL).html
+
+# if rule bomb out, delete the target
+.DELETE_ON_ERROR: