λδ site update

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

diff --git a/helm/www/lambdadelta/Makefile b/helm/www/lambdadelta/Makefile
index 98fb867c78d89d062e18f7a975205bec50266f94..a8ad6cbbd3dc261647b4376c97e81e710ce1473e 100644 (file)
--- a/helm/www/lambdadelta/Makefile
+++ b/helm/www/lambdadelta/Makefile
@@ -1,23 +1,23 @@
 SHELL := $(shell which bash)
 H=@
 
-TAGS = up-html up-html-ix up-home html html-ix home ldw ldw-ix
-
 TAGS = www up-html up-css up-images up-download \
        lint-xml index lddl install-xml \
        test-html html install-html \
        install-jed install-bib install-2 install-1 install-coq \
        install-automath install-v install-matita \
 
+TAGS = up-html up-html-ix up-home html html-ix home ldw ldw-ix install-2
+
 LDWEBURL = http://helm.cs.unibo.it/lambdadelta/
 
 SITEDIR    = html
 HTMLDIR    = html/lddl
 SRCDIR     = web/home
 LDDLDIR    = web/lddl
-XHTBLDIR   = bin/xhtbl
-INDEXDIR   = bin/index
 ETCDIR     = etc
+XHTBLDIR   = $(ETCDIR)/lambdadelta/bin/xhtbl
+INDEXDIR   = $(ETCDIR)/lambdadelta/bin/index
 DOWNDIR    = download
 XSLTDIR    = xslt
 XMLDIR     = xml
@@ -46,7 +46,6 @@ TABLES      = $(XSLTDIR)/xhtbl.xsl
 
 SLS     = helena.sl automath.sl
 BIB     = lambdadelta.bib
-CONTRIB = lambdadelta_2.tar.gz
 
 XMLS = Environment/grundlagen_2/l/not.ld.xml \
        Environment/grundlagen_2/l/et.ld.xml \
@@ -115,7 +114,7 @@ up-home: $(HOMESTAMP)
 
 # GENERATE HTML LDDL #########################################################
 
-$(HTMLSTAMP): LDWS = `find $(LDDLDIR) -name *.ldw.xml`
+$(HTMLSTAMP): LDWS = `find $(LDDLDIR) -name *.ldw.xml -not -name index.ldw.xml`
 
 $(HTMLSTAMP): $(LDWSTAMP) $(SITEMAP) $(LDWEB:%=$(XSLTDIR)/%)
        $(H)for LDW in $(LDWS); do \
@@ -125,7 +124,6 @@ $(HTMLSTAMP): $(LDWSTAMP) $(SITEMAP) $(LDWEB:%=$(XSLTDIR)/%)
        $(XSLT) $(XSLT_OUT) $$HTML $(XSLT_XSL) $(XSLTDIR)/ld_web.xsl $(XSLT_IN) $$LDW; \
        done
        $(H)touch $@
-       $(H)touch $(HTMLIXSTAMP)
 
 html: $(HTMLSTAMP)
 
@@ -146,7 +144,9 @@ html-ix: $(HTMLIXSTAMP)
 
 # GENERATE HTML HOME #########################################################
 
-$(HOMESTAMP): LDWS = `find -L $(WEBDIRS) -name "*.ldw.xml"`
+ifeq ($(MAKECMDGOALS),home)
+  LDWS = $(shell find -L $(WEBDIRS) -name *.ldw.xml)
+endif
 
 $(HOMESTAMP): $(LDWS) $(TABLES) $(LDWEB:%=$(XSLTDIR)/%)
        $(H)for LDW in $(LDWS); do \
@@ -160,7 +160,7 @@ home: $(HOMESTAMP)
 
 # GENERATE XSL ###############################################################
 
-$(TABLES) $(SITEMAP): TBLS = `find -L $(WEBDIRS) -name "*.tbl"`
+TBLS = $(shell find -L $(WEBDIRS) -name *.tbl)
 
 $(TABLES) $(SITEMAP): $(TBLS) $(XHTBL)
        @echo "  XHTBL $(XHTBLOPTS) *.tbl"
@@ -181,6 +181,15 @@ $(LDWIXSTAMP): $(INDEX)
 
 ldw-ix: $(LDWIXSTAMP)
 
+# INSTALL λδ-2 PACKAGES ######################################################
+
+install-2: PKGS = $(shell find -L $(CONTRIBDIR) -name lambdadelta_*.tar.bz2)
+
+install-2: $(PKGS)
+       @echo "  INSTALL $(PKGS:$(CONTRIBDIR)/lambdadelta_%.tar.bz2=%)"
+       $(H)scp $(PKGS) $(DOWNDIR)
+       $(H)$(RM) $(PKGS)
+
 ##############################################################################
 
 lint-xml: $(XMLS:%=$(XMLDIR)/%)
@@ -217,10 +226,6 @@ install-bib: $(BIB:%=$(BIBDIR)/%)
        $(H)scp $< $(DOWNDIR)
        $(H)scp $< $(DOWNDIR)/$(BIB:%.bib=%.txt)
 
-install-2: $(CONTRIB:%=$(CONTRIBDIR)/%)
-       @echo "  INSTALL $(CONTRIB)"
-       $(H)scp $< $(DOWNDIR)
-
 install-automath: $(HELENADIR)/$(AUTOMATH)
        @echo "  INSTALL $(notdir $<)"
        $(H)scp $< $(DOWNDIR)
@@ -259,3 +264,5 @@ up-download:
 #      $(H)$(XSLT) --novalid $(XSLT_OUT) $(LDDLDIR)/$@.ldw.xml $(XSLT_XSL) $(XSLTDIR)/lddl.xsl $(XSLT_IN) $(XMLDIR)/$@.xml
 
 .PHONY: $(TAGS)
+
+.SUFFIXES: