diff options
| author | Matthew Heon <matthew.heon@gmail.com> | 2018-09-27 09:42:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-27 09:42:43 -0400 |
| commit | 9bcf7ce83a7a293a1715e0742bf305df9e1eff11 (patch) | |
| tree | 4bb3379f823b67cb31799afd446383e4540c95ab /Makefile | |
| parent | 407354198169f33a1ebebca3ae47d5d0c34d9b42 (diff) | |
| parent | 356765aa959626d0d027484b2797958c24fe3c15 (diff) | |
| download | podman-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 'Makefile')
| -rw-r--r-- | Makefile | 7 |
1 files changed, 2 insertions, 5 deletions
@@ -24,7 +24,6 @@ ifneq (,$(findstring varlink,$(BUILDTAGS))) PODMAN_VARLINK_DEPENDENCIES = cmd/podman/varlink/iopodman.go endif -PYTHON ?= /usr/bin/python3 HAS_PYTHON3 := $(shell command -v python3 2>/dev/null) BASHINSTALLDIR=${PREFIX}/share/bash-completion/completions @@ -138,12 +137,10 @@ clean: libpod/container_easyjson.go \ libpod/pod_easyjson.go \ $(MANPAGES) ||: -ifdef HAS_PYTHON3 - $(MAKE) -C contrib/python/podman clean - $(MAKE) -C contrib/python/pypodman clean -endif find . -name \*~ -delete find . -name \#\* -delete + $(MAKE) -C contrib/python/podman clean + $(MAKE) -C contrib/python/pypodman clean libpodimage: docker build -t ${LIBPOD_IMAGE} . |