X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=blobdiff_plain;f=Makefile;h=90e70def9446fccf6895dca65d2c298565200c34;hp=3a7384bc99ac64d7e2cf22671b09ce3a581ed552;hb=HEAD;hpb=d919e8df04d1da8626e1e7a1e41865792cb91fa2 diff --git a/Makefile b/Makefile index 3a7384bc..90e70def 100644 --- a/Makefile +++ b/Makefile @@ -31,14 +31,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) + python3 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 (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 + python3 setup.py clean # rm $(init) version-clean: @@ -112,7 +112,7 @@ PYPI_TARBALL_TOPDIR=/build/sfa # this target is still helpful to produce the readme in html from README.md index.zip index.html: README.md - python readme.py + python3 readme.py # I need to run this on my mac as my pypi # run git pull first as this often comes afet a module-tag @@ -176,8 +176,7 @@ RSYNC := rsync -ai $(RSYNC_COND_DRY_RUN) --no-owner $(RSYNC_EXCLUDES) CLIENTS = $(shell ls clientbin/*.py) BINS = ./config/sfa-config-tty ./systemd/sfa-setup.sh \ - ./sfa/server/sfa-start.py \ - ./clientbin/sfaadmin.py \ + ./sfa/server/sfa-start.py ./clientbin/sfaadmin.py keyconvert/keyconvert.py \ $(CLIENTS) synclib: synccheck @@ -197,6 +196,7 @@ syncrestart: synccheck -$(SSHCOMMAND) systemctl --system daemon-reload $(SSHCOMMAND) systemctl restart sfa-db $(SSHCOMMAND) systemctl restart sfa-aggregate + $(SSHCOMMAND) systemctl restart sfa-registry syncmig: +$(RSYNC) ./sfa/storage/migrations $(SSHURL)/usr/share/sfa/