X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=3df691f6666fa68e7b1e68ac911a1f31a78ee3af;hb=53fb202a0ed1ef1df5c9c292de2fc410b782e5bb;hp=aa57797bc20be9712e054cf016bf851d7386dea7;hpb=7da03adbb0756fcf7e1a63e674bec1246c6ba4a1;p=plewww.git

diff --git a/Makefile b/Makefile
index aa57797..3df691f 100644
--- 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=.."
@@ -47,7 +46,7 @@ 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