- xhtbl: minor improvement

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

diff --git a/helm/www/lambdadelta/Makefile b/helm/www/lambdadelta/Makefile
index cbdcfd4f0c1f044b8d95f92118103b0a46b1b6b1..f46fcdc303454d6ffee77b37166195714f5e7067 100644 (file)
--- a/helm/www/lambdadelta/Makefile
+++ b/helm/www/lambdadelta/Makefile
@@ -14,8 +14,9 @@ DOWNDIR    = download
 XSLTDIR    = xslt
 XMLDIR     = xml
 SRCDIR     = web/home
+LDDLDIR    = web/lddl
 XHTBLDIR   = bin/xhtbl
-HTMLDIR    = $(HOME)/public_html/lddl
+HTMLDIR    = static/lddl
 JEDDIR     = $(HOME)/mps/jed
 BIBDIR     = $(HOME)/texmf/bibtex/bib
 CONTRIBDIR = $(ETCDIR)/lambdadelta
@@ -27,8 +28,8 @@ REMOTE   = helm.cs.unibo.it
 RDIR     = /projects/helm/public_html/lambdadelta
 RHOMEDIR = $(REMOTE):$(RDIR)
 RXMLDIR  = $(RHOMEDIR)/xml
-RHTMLDIR = $(RHOMEDIR)/static/lddl
 RDOWNDIR = $(RHOMEDIR)/download
+RHTMLDIR = /projects/helm/public_html/lambda-delta/static
 
 SLS     = helena.sl automath.sl
 BIB     = lambdadelta.bib
@@ -110,8 +111,6 @@ install-xml: $(DOWNDIR)/lddl.tar.bz2
        $(H)scp $^ $(RDOWNDIR)
        $(H)ssh $(REMOTE) "cd $(RDIR) && tar -xjf download/lddl.tar.bz2"
 
-#      $(H)scp -r $(XMLDIR) $(RXMLDIR)
-
 test-html:
        @$(MAKE) --no-print-directory $(XMLS:%.xml=%)
 
@@ -119,9 +118,11 @@ html: $(ETCDIR)/make_html.sh
        @echo "  MAKE */*.ld"
        $(H). $<
 
-install-html: $(ETCDIR)/make_html.sh
+install-html $(DOWNDIR)/static_lddl.tar.bz2: $(ETCDIR)/exclude.txt $(ETCDIR)/make_html.sh
        @echo "  INSTALL html"
-       $(H)scp -r $(HTMLDIR)/* $(RHTMLDIR)
+       $(H)tar -cjf $(DOWNDIR)/static_lddl.tar.bz2 -C static -X $< lddl 
+       $(H)scp $(DOWNDIR)/static_lddl.tar.bz2 $(RDOWNDIR)
+       $(H)ssh $(REMOTE) "cd $(RHTMLDIR) && tar -xjf ../../lambdadelta/download/static_lddl.tar.bz2
 
 install-jed: $(SLS:%=$(JEDDIR)/%)
        @echo "  INSTALL $(SLS)"
@@ -150,10 +151,9 @@ up:
 
 %.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)mkdir -p $(HTMLDIR)/$(@D)
-       $(H)$(XSLT) $(XSLT_OUT) $(HTMLDIR)/$@.html $(XSLT_XSL) $(XSLTDIR)/lddl.xsl $(XSLT_IN) $(XMLDIR)/$@.xml
-
-%.ldc:
-       @echo "  SKIP $@"
+       $(H)$(XSLT) $(XSLT_OUT) $(HTMLDIR)/$@.html $(XSLT_XSL) $(XSLTDIR)/ld_web.xsl $(XSLT_IN) $(LDDLDIR)/$@.ldw.xml
 
 .PHONY: $(TAGS)