X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fwww%2Flambdadelta%2FMakefile;h=a8ad6cbbd3dc261647b4376c97e81e710ce1473e;hb=614d006be363d2e2bbfdf8eb3c20c8604d278be1;hp=c58e3f597e013159f5d17b10f71676bf011a9b4d;hpb=25c634037771dff0138e5e8e3d4378183ff49b86;p=helm.git

diff --git a/helm/www/lambdadelta/Makefile b/helm/www/lambdadelta/Makefile
index c58e3f597..a8ad6cbbd 100644
--- 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,9 +114,7 @@ up-home: $(HOMESTAMP)
 
 # GENERATE HTML LDDL #########################################################
 
-ifeq ($(MAKECMDGOALS),html)
-  LDWS = $(shell find $(LDDLDIR) -name *.ldw.xml)
-endif
+$(HTMLSTAMP): LDWS = `find $(LDDLDIR) -name *.ldw.xml -not -name index.ldw.xml`
 
 $(HTMLSTAMP): $(LDWSTAMP) $(SITEMAP) $(LDWEB:%=$(XSLTDIR)/%)
 	$(H)for LDW in $(LDWS); do \
@@ -127,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)
 
@@ -185,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)/%)
@@ -221,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)