VMs on an lxc box are now located in /vservers/ (and have been so for a while aamof)

[sfa.git] / Makefile

diff --git a/Makefile b/Makefile
index e093660..ae9e7a6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -24,8 +24,8 @@ SCMURL=should-be-redefined-by-specfile
 
 python: version
 
-version: sfa/util/version.py
-sfa/util/version.py: sfa/util/version.py.in
+version: sfa/util/version.py 
+sfa/util/version.py: sfa/util/version.py.in force
        sed -e "s,@VERSIONTAG@,$(VERSIONTAG),g" -e "s,@SCMURL@,$(SCMURL),g" sfa/util/version.py.in > $@
 
 xmlbuilder-install:
@@ -125,12 +125,12 @@ force:
 
 ##########
 # a lot of stuff in the working dir is just noise
-scan:
+files:
        @find . -type f | egrep -v '^\./\.|/\.git/|/\.svn/|TAGS|AA-|~$$|egg-info|\.(py[co]|doc|html|pdf|png|svg|out|bak|dg|pickle)$$' 
 tags:  
-       $(MAKE) scan | xargs etags
+       $(MAKE) files | xargs etags
 
-.PHONY: scan tags
+.PHONY: files tags
 
 signatures:
        (cd sfa/methods; grep 'def.*call' *.py > SIGNATURES)
@@ -149,7 +149,7 @@ SSHURL:=root@$(PLC):/
 SSHCOMMAND:=ssh root@$(PLC)
 else
 ifdef PLCHOSTLXC
-SSHURL:=root@$(PLCHOSTLXC):/var/lib/lxc/$(GUESTNAME)/rootfs
+SSHURL:=root@$(PLCHOSTLXC):/vservers/$(GUESTNAME)/rootfs
 SSHCOMMAND:=ssh root@$(PLCHOSTLXC) ssh $(GUESTHOSTNAME)
 else
 ifdef PLCHOSTVS