no longer buildrequires nor requires pip2 packages

[sfa.git] / Makefile

diff --git a/Makefile b/Makefile
index 485f10a..be229f4 100644 (file)
--- 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:
@@ -188,8 +189,7 @@ RSYNC                       := rsync -a -v $(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