upload things to the right place h2010-final
authorSimon Marlow <marlowsd@gmail.com>
Tue, 6 Jul 2010 11:44:35 +0000 (11:44 +0000)
committerSimon Marlow <marlowsd@gmail.com>
Tue, 6 Jul 2010 11:44:35 +0000 (11:44 +0000)
Makefile

index ce77fca..7263b04 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -11,17 +11,19 @@ clean:
 release:
        cd tools && make
        cd report && make
-       mkdir haskell$(VERSION)
+       mkdir haskell$(VERSION) || true
        cp report/ht/*.html report/ht/*.png report/ht/*.css haskell$(VERSION)
        tar cvzf haskell$(VERSION)-html.tar.gz haskell$(VERSION)
 
 # If you have an account on www.haskell.org, the following rules will upload
 # the finished report to the correct places.
 UPLOAD_HOST = www.haskell.org
-UPLOAD_DIR = /home/haskell/onlinereport/haskell$(VERSION)
+UPLOAD_HTML_DIR = /home/haskell/onlinereport/haskell$(VERSION)
+UPLOAD_DEFN_DIR = /home/haskell/definition
 
 upload:
-       ssh $(UPLOAD_HOST) "mkdir $(UPLOAD_DIR) || true"
-       scp report/haskell.pdf $(UPLOAD_HOST):$(UPLOAD_DIR)
-       scp haskell$(VERSION)-html.tar.gz $(UPLOAD_HOST):$(UPLOAD_DIR)
-       ssh $(UPLOAD_HOST) "cd $(UPLOAD_DIR); tar xvzf haskell$(VERSION)-html.tar.gz; mv haskell$(VERSION)/* .; rmdir haskell$(VERSION); rm -f index.html; ln -s haskell.html index.html"
+       ssh $(UPLOAD_HOST) "mkdir $(UPLOAD_HTML_DIR) || true"
+       ssh $(UPLOAD_HOST) "mkdir $(UPLOAD_DEFN_DIR) || true"
+       scp report/haskell.pdf $(UPLOAD_HOST):$(UPLOAD_DEFN_DIR)/haskell$(VERSION).pdf
+       scp haskell$(VERSION)-html.tar.gz $(UPLOAD_HOST):$(UPLOAD_DEFN_DIR)
+       ssh $(UPLOAD_HOST) "cd $(UPLOAD_HTML_DIR); tar xvzf $(UPLOAD_DEFN_DIR)/haskell$(VERSION)-html.tar.gz; mv haskell$(VERSION)/* .; rmdir haskell$(VERSION); rm -f index.html; ln -s haskell.html index.html"