From 390bd16d3776b8ad0a85c84d70724c85021a1639 Mon Sep 17 00:00:00 2001 From: baude Date: Sun, 20 May 2018 10:50:06 -0500 Subject: tidy up the copr spec on os's (like centos) where python3 might not be installed, do not attempt to build the python3 varlink client. varlink python is only supported on python3. also, change the conditions for f28 to match the fedora official specs. Signed-off-by: baude Closes: #813 Approved by: baude --- Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 3833ac78d..f10f30949 100644 --- a/Makefile +++ b/Makefile @@ -19,6 +19,7 @@ TMPFILESDIR ?= ${PREFIX}/lib/tmpfiles.d SYSTEMDDIR ?= ${PREFIX}/lib/systemd/system BUILDTAGS ?= seccomp $(shell hack/btrfs_tag.sh) $(shell hack/libdm_tag.sh) $(shell hack/btrfs_installed_tag.sh) $(shell hack/ostree_tag.sh) $(shell hack/selinux_tag.sh) PYTHON ?= /usr/bin/python3 +HAS_PYTHON3 := $(shell command -v python3) BASHINSTALLDIR=${PREFIX}/share/bash-completion/completions OCIUMOUNTINSTALLDIR=$(PREFIX)/share/oci-umount/oci-umount.d @@ -95,7 +96,9 @@ podman: .gopathok API.md cmd/podman/varlink/ioprojectatomicpodman.go $(GO) build -i -ldflags '$(LDFLAGS_PODMAN)' -tags "$(BUILDTAGS)" -o bin/$@ $(PROJECT)/cmd/podman python-podman: +ifdef HAS_PYTHON3 $(MAKE) -C contrib/python python-podman +endif clean: rm -rf \ @@ -108,7 +111,9 @@ clean: test/copyimg/copyimg \ test/testdata/redis-image \ $(MANPAGES) - $(MAKE) -C contrib/python clean +ifdef HAS_PYTHON3 + $(MAKE) -C contrib/python clean +endif find . -name \*~ -delete find . -name \#\* -delete -- cgit v1.2.3-54-g00ecf