updating

[developers-reference.git] / Makefile

diff --git a/Makefile b/Makefile
index 1a49f3946cd29d148f9be5e06295329a5352dd4b..fff70f786ce984e48b3068dc7771a544469db9b9 100644 (file)
--- 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,, \
+                        $(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 developers-reference.fr.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: