X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=144c06c3ea9eddca13acc2b680b25e5e6e88a662;hb=b1f27f83087c333cbcb80c63b5d0e7b9a9f9d1ed;hp=db3b5f738e99afe40d2f11476474fd39acb74b9e;hpb=ae74d4304bb1033d1fe1dcde29360ad5fe73df63;p=sfa.git diff --git a/Makefile b/Makefile index db3b5f73..144c06c3 100644 --- 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: @@ -127,8 +127,12 @@ force: # a lot of stuff in the working dir is just noise files: @find . -type f | egrep -v '^\./\.|/\.git/|/\.svn/|TAGS|AA-|~$$|egg-info|\.(py[co]|doc|html|pdf|png|svg|out|bak|dg|pickle)$$' + +git-files: + @git ls-files | grep -v '\.doc$$' + tags: - $(MAKE) files | xargs etags + $(MAKE) git-files | xargs etags .PHONY: files tags @@ -149,7 +153,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