From a8ae2efbf7e09d6ddbb1eb9fd79cafa4e045ff9a Mon Sep 17 00:00:00 2001 From: Ferruccio Guidi Date: Tue, 17 Aug 2010 15:37:28 +0000 Subject: [PATCH] some fixes to cope with the new mowgli server architecture --- helm/software/lambda-delta/Makefile | 16 +++++++++------- helm/software/lambda-delta/Makefile.common | 3 ++- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/helm/software/lambda-delta/Makefile b/helm/software/lambda-delta/Makefile index a690738d3..683e422a4 100644 --- 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 7ab5447b6..434ece82f 100644 --- 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 $^ -- 2.39.2