create /usr/bin before installing into.

[sfa.git] / Makefile

diff --git a/Makefile b/Makefile
index db8c480..26251f0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ keyconvert-clean:
 .PHONY: keyconvert keyconvert-install keyconvert-clean 
 
 ##########
-python: index
+python: 
 
 python-install:
        python setup.py install --root=$(DESTDIR)
@@ -40,23 +40,10 @@ python-clean:
 
 # are the .java files used ?
 tags:  
-       find . -type f | egrep -v '/\.svn/|TAGS|\.py[co]$$|\.doc$$|\.html$$' | xargs etags
+       find . -type f | egrep -v '/\.svn/|TAGS|\.py[co]$$|\.doc$$|\.html$$|\.pdf$$' | xargs etags
 .PHONY: tags
 
 
-########## indexes
-subdirs = client methods plc server trust util
-init := geni/__init__.py $(foreach subdir, $(subdirs), geni/$(subdir)/__init__.py)
-
-force:
-.PHONY: force 
-
-index: $(init)
-.PHONY: index
-
-$(init):
-       touch $@
-
 ########## sync
 # 2 forms are supported
 # (*) if your plc root context has direct ssh access:
@@ -87,9 +74,9 @@ ifeq (,$(SSHURL))
        @echo "  or   make sync PLCHOST=testbox1.inria.fr GUEST=vplc03.inria.fr"
        @exit 1
 else
-       +$(RSYNC) ./geni/ $(SSHURL)/usr/lib/python2.5/site-packages/geni/
+       +$(RSYNC) ./sfa/ $(SSHURL)/usr/lib/python2.5/site-packages/sfa/
        +$(RSYNC) ./config/sfa-config-tty $(SSHURL)/usr/bin
-       $(SSHCOMMAND) exec service geni restart
+       $(SSHCOMMAND) exec service sfa restart
 endif
 
 .PHONY: sync