X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=0b57cd1f21738e13a96dfe070e1a184258c1ce4d;hb=refs%2Fheads%2Fpython2;hp=cb724a1dba2a799d45b64216ab66803b184a5e6f;hpb=27fc95b6cfef597d1da99b4a2b6b0c918ba9dafb;p=myplc.git

diff --git a/Makefile b/Makefile
index cb724a1..0b57cd1 100644
--- a/Makefile
+++ b/Makefile
@@ -16,15 +16,8 @@ ifdef PLC
 SSHURL:=root@$(PLC):/
 SSHCOMMAND:=ssh root@$(PLC)
 else
-ifdef PLCHOSTLXC
-SSHURL:=root@$(PLCHOSTLXC):/var/lib/lxc/$(GUESTNAME)/rootfs
+SSHURL:=root@$(PLCHOSTLXC):/vservers/$(GUESTNAME)/
 SSHCOMMAND:=ssh root@$(PLCHOSTLXC) ssh $(GUESTHOSTNAME)
-else
-ifdef PLCHOSTVS
-SSHURL:=root@$(PLCHOSTVS):/vservers/$(GUESTNAME)
-SSHCOMMAND:=ssh root@$(PLCHOSTVS) vserver $(GUESTNAME) exec
-endif
-endif
 endif
 
 LOCAL_RSYNC_EXCLUDES	:= --exclude '*.pyc' 
@@ -44,9 +37,9 @@ else
 	+$(RSYNC) bin/ $(SSHURL)/usr/bin/
 	+$(RSYNC) plc.d/ $(SSHURL)/etc/plc.d/
 	+$(RSYNC) db-config.d/ $(SSHURL)/etc/planetlab/db-config.d/
-	+$(RSYNC) plc_config.py $(SSHURL)/usr/lib/python2.\*/site-packages/plc_config.py
+	+$(RSYNC) plc_config.py $(SSHURL)/usr/lib\*/python2.\*/site-packages/plc_config.py
 	+$(RSYNC) default_config.xml $(SSHURL)/etc/planetlab/default_config.xml
-	@echo XXXXXXXX you might need to run ssh root@$(PLC) service plc start 
+	@echo XXXXXXXX you might need to run $(SSHCOMMAND) service plc start 
 endif
 
 #################### convenience, for debugging only