bugfix: the slice page was broken when nobody is in slice

[plewww.git] / Makefile

diff --git a/Makefile b/Makefile
index aa57797..aa1aed4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -12,14 +12,12 @@ tags:
 # $ run export
 # and cut'n paste the export lines before you run make sync
 
-PLCHOST ?= testplc.onelab.eu
-
 ifdef PLC
 SSHURL:=root@$(PLC):/
 SSHCOMMAND:=ssh root@$(PLC)
 else
 ifdef PLCHOSTLXC
-SSHURL:=root@$(PLCHOST):/var/lib/lxc/$(GUESTNAME)/rootfs
+SSHURL:=root@$(PLCHOSTLXC):/vservers/$(GUESTNAME)
 SSHCOMMAND:=ssh root@$(PLCHOSTLXC) ssh $(GUESTHOSTNAME)
 else
 ifdef PLCHOSTVS
@@ -35,6 +33,7 @@ RSYNC_COND_DRY_RUN    := $(if $(findstring n,$(MAKEFLAGS)),--dry-run,)
 RSYNC                  := rsync -a -v $(RSYNC_COND_DRY_RUN) $(RSYNC_EXCLUDES)
 
 sync:
+ifeq (,$(SSHURL))
        @echo "sync: I need more info from the command line, e.g."
        @echo "  make sync PLC=boot.planetlab.eu"
        @echo "  make sync PLCHOSTVS=.. GUESTNAME=.."
@@ -42,12 +41,13 @@ sync:
        @exit 1
 else
        +$(RSYNC) planetlab plekit modules $(SSHURL)/var/www/html/
+       +$(RSYNC) drupal-hacks/*.module $(SSHURL)/var/www/html/modules/
 endif
 
 compress:
        $(foreach file,\
                $(shell find . -type f -iname "*.js" | grep -v datepicker.js | grep -v raphael),\
-               $(shell python jsmin.py < $(file) > $(file).new && mv $(file).new $(file)))
+               $(shell python2 jsmin.py < $(file) > $(file).new && mv $(file).new $(file)))
        @echo "Compressed .js files with jsmin.py"
 
 .PHONY: compress