X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=390d107e39246f07bdd51013e96793f69e93eaf4;hb=0b42798bd0912332d8659cf4bd7848007122b222;hp=730bad4683ca31a3e8b611b7526c5fa854553c1e;hpb=4d3d3a72118240c88a3b654249c826b985b463cf;p=plcapi.git diff --git a/Makefile b/Makefile index 730bad4..390d107 100644 --- a/Makefile +++ b/Makefile @@ -5,6 +5,7 @@ # Copyright (C) 2005 The Trustees of Princeton University # # $Id$ +# $URL$ # # Metafiles - manage Legacy/ and Accessors by hand @@ -79,6 +80,7 @@ PLC/Methods/__init__.py: (echo '## Please use make index to update this file' ; echo 'native_methods = """' ; cd PLC/Methods; ls -1 *.py system/*.py | grep -v __init__ | sed -e 's,.py$$,,' -e 's,system/,system.,' ; echo '""".split()') > $@ ########## + force: .PHONY: all install force clean index tags $(subdirs) @@ -96,12 +98,12 @@ tags: # (*) otherwise, entering through the root context # make sync PLCHOST=testbox1.inria.fr GUEST=vplc03.inria.fr +PLCHOST ?= testplc.onelab.eu + ifdef GUEST -ifdef PLCHOST SSHURL:=root@$(PLCHOST):/vservers/$(GUEST) SSHCOMMAND:=ssh root@$(PLCHOST) vserver $(GUEST) endif -endif ifdef PLC SSHURL:=root@$(PLC):/ SSHCOMMAND:=ssh root@$(PLC) @@ -115,7 +117,7 @@ RSYNC := rsync -a -v $(RSYNC_COND_DRY_RUN) $(RSYNC_EXCLUDES) sync: ifeq (,$(SSHURL)) @echo "sync: You must define, either PLC, or PLCHOST & GUEST, on the command line" - @echo " e.g. make sync PLC=private.one-lab.org" + @echo " e.g. make sync PLC=boot.planetlab.eu" @echo " or make sync PLCHOST=testbox1.inria.fr GUEST=vplc03.inria.fr" @exit 1 else