grundlagen web pages updated

[helm.git] / helm / www / lambdadelta / Makefile

diff --git a/helm/www/lambdadelta/Makefile b/helm/www/lambdadelta/Makefile
index 2f35c136573f74114dd25b5ae9ebc506003ef97d..51ecbd1a5698e532571a967c8d09c4669c650403 100644 (file)
--- a/helm/www/lambdadelta/Makefile
+++ b/helm/www/lambdadelta/Makefile
@@ -17,7 +17,7 @@ XMLDIR     = xml
 SRCDIR     = web/home
 LDDLDIR    = web/lddl
 XHTBLDIR   = bin/xhtbl
-HTMLDIR    = static/lddl
+HTMLDIR    = html/lddl
 JEDDIR     = $(HOME)/mps/jed
 BIBDIR     = $(HOME)/texmf/bibtex/bib
 CONTRIBDIR = $(ETCDIR)/lambdadelta
@@ -50,7 +50,7 @@ COQ      = coq/grundlagen_2.v
 MATITA = matita/root matita/grundlagen_2.ma
 
 XMLLINT = xmllint --noout
-XSLT    = xalan
+XSLT    = xsltproc
 XHTBL   = $(XHTBLDIR)/xhtbl.native
 
 XHTBLOPTS =
@@ -102,7 +102,7 @@ lint-xml: $(XMLS:%=$(XMLDIR)/%)
        @echo XMLLINT --valid
        $(H)$(XMLLINT) --valid $^
 
-$(ETCDIR)/make-html.sh $(XMLDIR)/index.txt index:
+$(ETCDIR)/make_html.sh $(XMLDIR)/index.txt index:
        @echo "  GENERATE INDEXES"
        $(H)find $(XMLDIR) -name "*.ld.xml" | sed s/.xml//g | sed s/xml/ld:/g > $(XMLDIR)/index.txt
        $(H)sed "s/^/make --no-print-directory /" $(XMLDIR)/index.txt | sed s.ld:/.. > $(ETCDIR)/make_html.sh
@@ -164,7 +164,7 @@ install-v: $(HELENADIR)/$(COQ)
 
 up-html:
        @echo "  UPDATE $(RHOMEDIR)/html/"
-       $(H)scp -q -r html $(RHOMEDIR)
+       $(H)scp -q html/*.html $(RHOMEDIR)/html/
 
 up-css:
        @echo "  UPDATE $(RHOMEDIR)/css/"
@@ -181,7 +181,7 @@ up-download:
 %.ld:
        @echo "  XSLT $@"
        $(H)mkdir -p $(LDDLDIR)/$(@D)
-       $(H)$(XSLT) $(XSLT_OUT) $(LDDLDIR)/$@.ldw.xml $(XSLT_XSL) $(XSLTDIR)/lddl.xsl $(XSLT_IN) $(XMLDIR)/$@.xml
+       $(H)$(XSLT) --novalid $(XSLT_OUT) $(LDDLDIR)/$@.ldw.xml $(XSLT_XSL) $(XSLTDIR)/lddl.xsl $(XSLT_IN) $(XMLDIR)/$@.xml
        $(H)mkdir -p $(HTMLDIR)/$(@D)
        $(H)$(XSLT) $(XSLT_OUT) $(HTMLDIR)/$@.html $(XSLT_XSL) $(XSLTDIR)/ld_web.xsl $(XSLT_IN) $(LDDLDIR)/$@.ldw.xml