X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=be229f4d1f6f9dd8dac2ace86213c819d95d47bb;hb=refs%2Fheads%2Fpython2;hp=59a2d220fc9bcafbca3d16640ea24ab2f395f7f3;hpb=4948d60ec323588e00627eee303aa3859bba3c41;p=sfa.git

diff --git a/Makefile b/Makefile
index 59a2d220..be229f4d 100644
--- a/Makefile
+++ b/Makefile
@@ -4,12 +4,13 @@
 # overwritten by the specfile
 DESTDIR="/"
 PREFIX=/usr
+
 ##########
-all: python wsdl
+all: python
 
-install: python-install wsdl-install tests-install
+install: python-install tests-install
 
-clean: python-clean wsdl-clean
+clean: python-clean
 
 uninstall: python-uninstall tests-uninstall
 
@@ -31,14 +32,14 @@ sfa/util/version.py: sfa/util/version.py.in force
 
 # postinstall steps - various cleanups and tweaks for a nicer rpm
 python-install:
-	python setup.py install --prefix=$(PREFIX) --root=$(DESTDIR)
+	python2 setup.py install --prefix=$(PREFIX) --root=$(DESTDIR)
 	chmod 444 $(DESTDIR)/etc/sfa/default_config.xml
-	rm -rf $(DESTDIR)/usr/lib*/python*/site-packages/*egg-info
-	rm -rf $(DESTDIR)/usr/lib*/python*/site-packages/sfa/storage/migrations
+	rm -rf $(DESTDIR)/usr/lib*/python2*/site-packages/*egg-info
+	rm -rf $(DESTDIR)/usr/lib*/python2*/site-packages/sfa/storage/migrations
 	(cd $(DESTDIR)/usr/bin ; ln -s sfi.py sfi; ln -s sfascan.py sfascan; ln -s sfaadmin.py sfaadmin)
 
 python-clean: version-clean
-	python setup.py clean
+	python2 setup.py clean
 #	rm $(init)
 
 version-clean:
@@ -187,9 +188,8 @@ RSYNC			:= rsync -a -v $(RSYNC_COND_DRY_RUN) --no-owner $(RSYNC_EXCLUDES)
 
 CLIENTS = $(shell ls clientbin/*.py)
 
-BINS =	./config/sfa-config-tty ./config/gen-sfa-cm-config.py ./systemd/sfa-setup.sh \
-	./sfa/server/sfa-start.py \
-	./clientbin/sfaadmin.py \
+BINS =	./config/sfa-config-tty ./systemd/sfa-setup.sh \
+	./sfa/server/sfa-start.py ./clientbin/sfaadmin.py keyconvert/keyconvert.py \
 	$(CLIENTS)
 
 synclib: synccheck
@@ -211,7 +211,8 @@ synctest: synccheck
 	+$(RSYNC) ./tests/ $(SSHURL)/root/tests-sfa
 syncrestart: synccheck
 	-$(SSHCOMMAND) systemctl --system daemon-reload
-	$(SSHCOMMAND) service sfa restart
+	$(SSHCOMMAND) systemctl restart sfa-db
+	$(SSHCOMMAND) systemctl restart sfa-aggregate
 
 syncmig:
 	+$(RSYNC) ./sfa/storage/migrations $(SSHURL)/usr/share/sfa/