From 096af85278967421533ffa9975078eccd57b5b5d Mon Sep 17 00:00:00 2001 From: baude Date: Wed, 7 Aug 2019 14:27:49 -0400 Subject: add make to make installs as issue #2702 describes, we want to make podman and podman-remote as part of make install. Fixes: #2702 Signed-off-by: baude avoid `make` in `make install` in the rpmbuild process. Signed-off-by: Lokesh Mandvekar --- Makefile | 4 ++-- contrib/spec/podman.spec.in | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 29eb9b3af..dbc10aa8c 100644 --- a/Makefile +++ b/Makefile @@ -333,12 +333,12 @@ changelog: ## Generate changelog install: .gopathok install.bin install.remote install.man install.cni install.systemd ## Install binaries to system locations -install.remote: +install.remote: podman-remote install ${SELINUXOPT} -d -m 755 $(DESTDIR)$(BINDIR) install ${SELINUXOPT} -m 755 bin/podman-remote $(DESTDIR)$(BINDIR)/podman-remote test -z "${SELINUXOPT}" || chcon --verbose --reference=$(DESTDIR)$(BINDIR)/podman bin/podman-remote -install.bin: +install.bin: podman install ${SELINUXOPT} -d -m 755 $(DESTDIR)$(BINDIR) install ${SELINUXOPT} -m 755 bin/podman $(DESTDIR)$(BINDIR)/podman test -z "${SELINUXOPT}" || chcon --verbose --reference=$(DESTDIR)$(BINDIR)/podman bin/podman diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in index 9d8467783..7e361d757 100644 --- a/contrib/spec/podman.spec.in +++ b/contrib/spec/podman.spec.in @@ -354,9 +354,13 @@ providing packages with %{import_path} prefix. %prep %autosetup -Sgit -n %{repo}-%{shortcommit0} -# untar cri-o +# untar conmon tar zxf %{SOURCE1} +sed -i 's/install.remote: podman-remote/install.remote:/' Makefile +sed -i 's/install.bin: podman/install.bin:/' Makefile +sed -i 's/install.man: docs/install.man:/' Makefile + %build mkdir _build pushd _build -- cgit v1.2.3-54-g00ecf