X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=aa1aed422aed27265b5e48e5f862983e788d483e;hb=e417acbe5b45f14f5f7b0f297a327d2aa18c7038;hp=47c2f44e5dca483b303399ace4a956e7fc84ea4f;hpb=501fce3d006fbec6ab929dedc9be7448f687fc80;p=plewww.git

diff --git a/Makefile b/Makefile
index 47c2f44..aa1aed4 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
@@ -43,12 +41,13 @@ ifeq (,$(SSHURL))
 	@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