fix a typo, thanks to Antoine Hulin

[developers-reference.git] / Makefile

diff --git a/Makefile b/Makefile
index 703959de9d408af6483c945591e93c670cc0abab..6052b0052ccede933d731fe66848c78cca24d109 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,27 +4,31 @@ MANUAL                := $(notdir $(shell pwd))
 PUBLISHDIR     := ../../../public_html/manuals.html
 
 TARGETS                := $(foreach fmt,html txt pdf,developers-reference.$(fmt)) \
-                  $(foreach langext,.ja .fr, \
-                     $(foreach fmt,html txt pdf,developers-reference$(langext).$(fmt)))
+                  $(filter-out developers-reference.ja.pdf, \
+                     $(foreach langext,.ja .fr, \
+                        $(foreach fmt,html txt pdf,developers-reference$(langext).$(fmt))))
 
 # programs for creating output
 DEBIANDOC2HTML := debiandoc2html -d debiandoc.decl -c
 DEBIANDOC2TEXT := debiandoc2text -d debiandoc.decl
 DEBIANDOC2LATEX        := debiandoc2latex -d debiandoc.decl
 
+make_directory := install -d -m 755
+install_file   := install -m 644 -p
+
 MAX_TEX_RECURSION := 5
 
 .PHONY:        all
 all:    $(TARGETS)
 
+# hmmm, this rule may need to be revised/tested
 publish:       all
        [ -d $(PUBLISHDIR) ] || exit 1
        rm -f $(PUBLISHDIR)/$(MANUAL)/*.html
-       install -d -m 755 $(PUBLISHDIR)/$(MANUAL)
-       install -m 644 --preserve-timestamps $(MANUAL).html/*.html      \
+       $(make_directory) $(PUBLISHDIR)/$(MANUAL)
+       $(install_file) developers-reference*.html/*.html       \
           $(PUBLISHDIR)/$(MANUAL)
 
-
 developers-reference.html:     developers-reference.sgml
        $(DEBIANDOC2HTML) -l C $<
 
@@ -65,11 +69,17 @@ developers-reference.%.tex: developers-reference.%.sgml
        fi
        rm -f prior.aux pprior.aux
 
-
-
-version.ent:
+version.ent:   debian/changelog
        ./debian/rules $@
 
+USERMAP        := ../../ddp/CVSROOT/users
+.PHONY: prepare
+prepare:
+       @[ -f CVS/Root -a -f $(USERMAP) ] || \
+               ( echo "silly rabbit, prepare is for Adam" 1>&2; exit 1 )
+       cvs2cl -r --usermap $(USERMAP)
+#      cvs ci -m "update for next release" ChangeLog
+
 .PHONY: clean
 clean:
        rm -rf developers-reference*.html
@@ -78,8 +88,10 @@ clean:
              developers-reference*.sasp* developers-reference*.tex \
              developers-reference*.aux developers-reference*.toc \
              developers-reference*.idx developers-reference*.log \
-             developers-reference*.out
+             developers-reference*.out developers-reference*.dvi
        rm -f version.ent
        rm -f `find . -name "*~"`
 
-developers-reference$(SRCEXT).sgml: version.ent common.ent
\ No newline at end of file
+developers-reference$(SRCEXT).sgml: version.ent common.ent
+
+html: $(MANUAL).html