X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile;h=97d7c1e6db3f4f17669128221d6eaff875c81eec;hb=0108f286a50871243923c0a231222cecf05f7553;hp=b8398739b912f4689a7c00205158b982cd293d47;hpb=28272f55151521852356e403909e1f8f56507b59;p=developers-reference.git

diff --git a/Makefile b/Makefile
index b839873..97d7c1e 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 .fr, \
-		         $(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
@@ -22,8 +22,12 @@ 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))
@@ -77,11 +81,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:
@@ -91,7 +98,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
@@ -104,3 +112,6 @@ distclean: clean
 developers-reference$(SRCEXT).sgml: version.ent common.ent
 
 html: $(MANUAL).html
+
+# if rule bomb out, delete the target
+.DELETE_ON_ERROR: