summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorMatthew Heon <matthew.heon@gmail.com>2018-09-27 09:42:43 -0400
committerGitHub <noreply@github.com>2018-09-27 09:42:43 -0400
commit9bcf7ce83a7a293a1715e0742bf305df9e1eff11 (patch)
tree4bb3379f823b67cb31799afd446383e4540c95ab /contrib
parent407354198169f33a1ebebca3ae47d5d0c34d9b42 (diff)
parent356765aa959626d0d027484b2797958c24fe3c15 (diff)
downloadpodman-9bcf7ce83a7a293a1715e0742bf305df9e1eff11.tar.gz
podman-9bcf7ce83a7a293a1715e0742bf305df9e1eff11.tar.bz2
podman-9bcf7ce83a7a293a1715e0742bf305df9e1eff11.zip
Merge pull request #818 from wking/python-2-clean
Makefile: Call contrib/python's clean regardless of HAS_PYTHON3
Diffstat (limited to 'contrib')
-rw-r--r--contrib/python/podman/Makefile4
-rwxr-xr-x[-rw-r--r--]contrib/python/podman/setup.py2
-rw-r--r--contrib/python/pypodman/Makefile4
-rwxr-xr-x[-rw-r--r--]contrib/python/pypodman/setup.py2
4 files changed, 8 insertions, 4 deletions
diff --git a/contrib/python/podman/Makefile b/contrib/python/podman/Makefile
index f691092b7..6ec4159f2 100644
--- a/contrib/python/podman/Makefile
+++ b/contrib/python/podman/Makefile
@@ -1,4 +1,4 @@
-PYTHON ?= /usr/bin/python3
+PYTHON ?= $(shell command -v python3 2>/dev/null || command -v python)
DESTDIR ?= /
PODMAN_VERSION ?= '0.0.4'
@@ -32,7 +32,7 @@ uninstall:
.PHONY: clean
clean:
- $(PYTHON) setup.py clean --all
rm -rf podman.egg-info dist
find . -depth -name __pycache__ -exec rm -rf {} \;
find . -depth -name \*.pyc -exec rm -f {} \;
+ $(PYTHON) ./setup.py clean --all
diff --git a/contrib/python/podman/setup.py b/contrib/python/podman/setup.py
index 2953ba0dc..9d54bb3ac 100644..100755
--- a/contrib/python/podman/setup.py
+++ b/contrib/python/podman/setup.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+
import os
from setuptools import find_packages, setup
diff --git a/contrib/python/pypodman/Makefile b/contrib/python/pypodman/Makefile
index 8c9691996..cd0fcf1de 100644
--- a/contrib/python/pypodman/Makefile
+++ b/contrib/python/pypodman/Makefile
@@ -1,4 +1,4 @@
-PYTHON ?= /usr/bin/python3
+PYTHON ?= $(shell command -v python3 2>/dev/null || command -v python)
DESTDIR := /
PODMAN_VERSION ?= '0.0.4'
@@ -31,7 +31,7 @@ clobber: uninstall clean
.PHONY: clean
clean:
- $(PYTHON) setup.py clean --all
rm -rf pypodman.egg-info dist
find . -depth -name __pycache__ -exec rm -rf {} \;
find . -depth -name \*.pyc -exec rm -f {} \;
+ $(PYTHON) ./setup.py clean --all
diff --git a/contrib/python/pypodman/setup.py b/contrib/python/pypodman/setup.py
index 0f80d4060..f07e89201 100644..100755
--- a/contrib/python/pypodman/setup.py
+++ b/contrib/python/pypodman/setup.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+
import os
from setuptools import find_packages, setup