diff --git a/Makefile b/Makefile index 12d1c8261dbe1bc5fde719d6394d3012d3e2d313..bb96c2b6241ebfce9ee7d9aed53345e2e1d616c2 100644 --- a/Makefile +++ b/Makefile @@ -87,10 +87,10 @@ run-tests-unit: FORCE @PYTHONPATH=$(TESTLIBS) nosetests-$(PYVER3) -v -s test/test_common.py instdeps: - sudo dnf install python-nose python3-gobject pygobject3 python3-nose + sudo dnf install python2-nose python3-gobject pygobject3 python3-nose get-builddeps: - sudo dnf install perl-TimeDate gettext intltool rpmdevtools python-devel python3-devel python3-nose tito + sudo dnf install perl-TimeDate gettext intltool rpmdevtools python2-devel python3-devel python3-nose tito build-setup: diff --git a/python/dnfdaemon/Makefile b/python/dnfdaemon/Makefile index 2e6b51b0a018a99c02fdc5fa650a3646697e87c9..15b22c7b1cd31ce29bc87550a20955bbaddd7a46 100644 --- a/python/dnfdaemon/Makefile +++ b/python/dnfdaemon/Makefile @@ -1,11 +1,11 @@ -PYTHON=python +PYTHON2=python2 PYTHON3=python3 PACKAGE = dnfdaemon PYFILES = $(wildcard *.py) -PYVER := $(shell $(PYTHON) -c 'import sys; print("%.3s" %(sys.version))') -PYSYSDIR := $(shell $(PYTHON) -c 'import sys; print(sys.prefix)') -PYLIBDIR = $(PYSYSDIR)/lib/python$(PYVER) -PKGDIR = $(PYLIBDIR)/site-packages/$(PACKAGE) +PYVER2 := $(shell $(PYTHON2) -c 'import sys; print("%.3s" %(sys.version))') +PYSYSDIR2 := $(shell $(PYTHON2) -c 'import sys; print(sys.prefix)') +PYLIBDIR2 = $(PYSYSDIR2)/lib/python$(PYVER2) +PKGDIR2 = $(PYLIBDIR2)/site-packages/$(PACKAGE) PYVER3 := $(shell $(PYTHON3) -c 'import sys; print("%.3s" %(sys.version))') PYSYSDIR3 := $(shell $(PYTHON3) -c 'import sys; print(sys.prefix)') PYLIBDIR3 = $(PYSYSDIR3)/lib/python$(PYVER3) @@ -19,9 +19,9 @@ clean: install: - mkdir -p $(DESTDIR)/$(PKGDIR) + mkdir -p $(DESTDIR)/$(PKGDIR2) mkdir -p $(DESTDIR)/$(PKGDIR3) for p in $(PYFILES) ; do \ - install -m 644 $$p $(DESTDIR)/$(PKGDIR)/$$p; \ + install -m 644 $$p $(DESTDIR)/$(PKGDIR2)/$$p; \ install -m 644 $$p $(DESTDIR)/$(PKGDIR3)/$$p; \ done diff --git a/python/dnfdaemon/client/Makefile b/python/dnfdaemon/client/Makefile index 5b034d2211b81365e5bef70c1ef5fdf429cd5526..7f0191937f02b65bf93d632ff7883e71b0428ebc 100644 --- a/python/dnfdaemon/client/Makefile +++ b/python/dnfdaemon/client/Makefile @@ -1,11 +1,11 @@ -PYTHON=python +PYTHON2=python2 PYTHON3=python3 PACKAGE = dnfdaemon/client PYFILES = $(wildcard *.py) -PYVER := $(shell $(PYTHON) -c 'import sys; print("%.3s" %(sys.version))') -PYSYSDIR := $(shell $(PYTHON) -c 'import sys; print(sys.prefix)') -PYLIBDIR = $(PYSYSDIR)/lib/python$(PYVER) -PKGDIR = $(PYLIBDIR)/site-packages/$(PACKAGE) +PYVER2 := $(shell $(PYTHON2) -c 'import sys; print("%.3s" %(sys.version))') +PYSYSDIR2 := $(shell $(PYTHON2) -c 'import sys; print(sys.prefix)') +PYLIBDIR2 = $(PYSYSDIR2)/lib/python$(PYVER2) +PKGDIR2 = $(PYLIBDIR2)/site-packages/$(PACKAGE) PYVER3 := $(shell $(PYTHON3) -c 'import sys; print("%.3s" %(sys.version))') PYSYSDIR3 := $(shell $(PYTHON3) -c 'import sys; print(sys.prefix)') PYLIBDIR3 = $(PYSYSDIR3)/lib/python$(PYVER3) @@ -19,9 +19,9 @@ clean: install: - mkdir -p $(DESTDIR)/$(PKGDIR) + mkdir -p $(DESTDIR)/$(PKGDIR2) mkdir -p $(DESTDIR)/$(PKGDIR3) for p in $(PYFILES) ; do \ - install -m 644 $$p $(DESTDIR)/$(PKGDIR)/$$p; \ + install -m 644 $$p $(DESTDIR)/$(PKGDIR2)/$$p; \ install -m 644 $$p $(DESTDIR)/$(PKGDIR3)/$$p; \ done