some fixes to cope with the new mowgli server architecture

diff --git a/helm/software/lambda-delta/Makefile b/helm/software/lambda-delta/Makefile
index a690738d3d522e70630654d7627fa159ff2fbc9b..683e422a41313570582265e7fe0e2f5662b2d671 100644 (file)
--- a/helm/software/lambda-delta/Makefile
+++ b/helm/software/lambda-delta/Makefile
@@ -23,8 +23,6 @@ XMLS = xml/brg-si/grundlagen/l/not.ld.xml \
 
 include Makefile.common
 
-LDDLDIR = ../../../public_html/lddl
-
 HOME = .
 
 INPUT = examples/grundlagen/grundlagen.aut
@@ -59,8 +57,8 @@ etc:
 
 %.ld:
        @echo "  XSLT $@"
-       $(H)mkdir -p $(LDDLDIR)/$(@D)
-       $(H)$(XSLT) -o $(LDDLDIR)/$@.html $(BASEURL) xml/ld-html.xsl xml/$@.xml
+       $(H)mkdir -p $(LOCALLDDLDIR)/$(@D)
+       $(H)$(XSLT) -o $(LOCALLDDLDIR)/$@.html $(BASEURL) xml/ld-html.xsl xml/$@.xml
 
 etc/make-html.sh xml/index.txt index:
        @echo "  GENERATE INDEXES"
@@ -74,8 +72,12 @@ html: etc/make-html.sh
 test-html:
        @$(MAKE) --no-print-directory $(XMLS:xml/%.xml=%)
 
-lddl: index
-       @echo "  GENERATE lddl.tar.bz2"
+install-html: etc/make-html.sh
+       @echo "  INSTALL xml"
+       $(H)scp -r $(LOCALLDDLDIR)/* $(LDDLDIR)
+
+install-lddl: index
+       @echo "  INSTALL lddl.tar.bz2"
        $(H)tar -cjf $(DOWNDIR)/lddl.tar.bz2 -X etc/exclude.txt xml
 
 install-dtd: xml/ld.dtd
@@ -84,7 +86,7 @@ install-dtd: xml/ld.dtd
 
 install-xml: etc/make-html.sh
        @echo "  INSTALL xml"
-       $(H)cp -a xml/index.txt xml/ld.dtd xml/brg-si/ $(XMLDIR)
+       $(H)scp -r xml/index.txt xml/ld.dtd xml/brg-si/ xml/crg-si/ $(XMLDIR)
 
 # old targets ##########################################################
 

diff --git a/helm/software/lambda-delta/Makefile.common b/helm/software/lambda-delta/Makefile.common
index 7ab5447b6fdd6fc556ff1a4f23c7593f5848ef17..434ece82f7aa6d84ff2aa5b05ca14f0404e1d110 100644 (file)
--- a/helm/software/lambda-delta/Makefile.common
+++ b/helm/software/lambda-delta/Makefile.common
@@ -9,6 +9,7 @@ LDDLURL = http://helm.cs.unibo.it/lambda-delta/static/lddl
 LDDLDIR = mowgli:/projects/helm/public_html/lambda-delta/static/lddl
 DOWNDIR = mowgli:/projects/helm/public_html/lambda-delta/download
 XMLDIR  = mowgli:/projects/helm/public_html/lambda-delta/xml
+LOCALLDDLDIR = ../../../public_html/lddl
 
 DIRECTORIES = $(addprefix $(SRC)/,$(shell cat $(SRC)/Make))
 
@@ -66,7 +67,7 @@ clean:
        @echo "  CLEAN . $(SRC)"
        $(H)find -name "*~" | xargs $(RM) $(CLEAN)
 
-lint: $(XMLS)
+lint-xml: $(XMLS)
        @echo XMLLINT --valid
        $(H)$(XMLLINT) --valid $^