diff options
| author | Adam Stokes <adam.stokes@ubuntu.com> | 2014-08-07 16:15:41 +0200 |
|---|---|---|
| committer | Bryn M. Reeves <bmr@redhat.com> | 2014-08-07 17:47:38 +0100 |
| commit | 89ee717b9db8f55c4a5c100eb39b5bb0e5354d86 (patch) | |
| tree | 7f44c0047fbccc3ea7e2099769a00706ed37a5d9 | |
| parent | 3c1c472aa163f9536660271787a6bdb28faf6d5a (diff) | |
| download | sos-89ee717b9db8f55c4a5c100eb39b5bb0e5354d86.tar.gz | |
[Makefile] makefile tasks to work with python2 and 3
Fixed some of the inline python statements to support makefile rules
in both python2 and python3
Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
| -rw-r--r-- | sos/Makefile | 4 | ||||
| -rw-r--r-- | sos/plugins/Makefile | 4 | ||||
| -rw-r--r-- | sos/policies/Makefile | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sos/Makefile b/sos/Makefile index de3f8498..ed5f603c 100644 --- a/sos/Makefile +++ b/sos/Makefile @@ -1,7 +1,7 @@ PYTHON=python PACKAGE = $(shell basename `pwd`) -PYVER := $(shell $(PYTHON) -c 'import sys; print "%.3s" %(sys.version)') -PYSYSDIR := $(shell $(PYTHON) -c 'import sys; print sys.prefix') +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) diff --git a/sos/plugins/Makefile b/sos/plugins/Makefile index 06815cb2..b1e2f5e5 100644 --- a/sos/plugins/Makefile +++ b/sos/plugins/Makefile @@ -1,8 +1,8 @@ PYTHON=python PACKAGE = $(shell basename `pwd`) PYFILES = $(wildcard *.py) -PYVER := $(shell $(PYTHON) -c 'import sys; print "%.3s" %(sys.version)') -PYSYSDIR := $(shell $(PYTHON) -c 'import sys; print sys.prefix') +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/sos/$(PACKAGE) diff --git a/sos/policies/Makefile b/sos/policies/Makefile index 06815cb2..b1e2f5e5 100644 --- a/sos/policies/Makefile +++ b/sos/policies/Makefile @@ -1,8 +1,8 @@ PYTHON=python PACKAGE = $(shell basename `pwd`) PYFILES = $(wildcard *.py) -PYVER := $(shell $(PYTHON) -c 'import sys; print "%.3s" %(sys.version)') -PYSYSDIR := $(shell $(PYTHON) -c 'import sys; print sys.prefix') +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/sos/$(PACKAGE) |