X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fwww%2Flambdadelta%2FMakefile;h=51ecbd1a5698e532571a967c8d09c4669c650403;hb=21e21b3b061807035bbd18d29d7a4fd8086ca10d;hp=76705a3f88c2fe0330d3f97a9e3cf3164f219343;hpb=2ec8ae0a49716b205bbf63568ee625ec1e9eb524;p=helm.git

diff --git a/helm/www/lambdadelta/Makefile b/helm/www/lambdadelta/Makefile
index 76705a3f8..51ecbd1a5 100644
--- a/helm/www/lambdadelta/Makefile
+++ b/helm/www/lambdadelta/Makefile
@@ -6,7 +6,8 @@ TAGS = www up-html up-css up-images up-download \
        install-jed install-bib install-2 install-1 install-coq \
        install-automath install-v install-matita \
 
-LDURL   = http://lambdadelta.info/
+# LDURL = http://lambdadelta.info/
+LDURL = http://helm.cs.unibo.it/lambdadelta/
 
 SITEDIR    = html
 ETCDIR     = etc
@@ -16,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
@@ -49,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 =
@@ -101,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
@@ -163,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/"
@@ -180,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