aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2019-05-17 11:40:45 -0400
committerDaniel J Walsh <dwalsh@redhat.com>2019-05-17 14:20:45 -0400
commit6154ba4a8060f6ea9fd7e80e3f8085d34c816422 (patch)
treee67ec982567a603145da06213daa2e7e12ba2517
parent144244aeed673957692bc6cf36c933e4b2d93a80 (diff)
downloadpodman-6154ba4a8060f6ea9fd7e80e3f8085d34c816422.tar.gz
podman-6154ba4a8060f6ea9fd7e80e3f8085d34c816422.tar.bz2
podman-6154ba4a8060f6ea9fd7e80e3f8085d34c816422.zip
install.remote should be separate for install.bin
For people who want to install podman remote or podman only we need to separate out the two install commands. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
-rw-r--r--Makefile9
-rw-r--r--contrib/spec/podman.spec.in1
2 files changed, 7 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index f73aff2e9..c7c3a0d17 100644
--- a/Makefile
+++ b/Makefile
@@ -259,14 +259,17 @@ changelog: ## Generate changelog
$(shell cat $(TMPFILE) >> changelog.txt)
$(shell rm $(TMPFILE))
-install: .gopathok install.bin install.man install.cni install.systemd ## Install binaries to system locations
+install: .gopathok install.bin install.remote install.man install.cni install.systemd ## Install binaries to system locations
+
+install.remote:
+ install ${SELINUXOPT} -d -m 755 $(BINDIR)
+ install ${SELINUXOPT} -m 755 bin/podman-remote $(BINDIR)/podman-remote
+ test -z "${SELINUXOPT}" || chcon --verbose --reference=$(BINDIR)/podman bin/podman-remote
install.bin:
install ${SELINUXOPT} -d -m 755 $(BINDIR)
install ${SELINUXOPT} -m 755 bin/podman $(BINDIR)/podman
- install ${SELINUXOPT} -m 755 bin/podman-remote $(BINDIR)/podman-remote
test -z "${SELINUXOPT}" || chcon --verbose --reference=$(BINDIR)/podman bin/podman
- test -z "${SELINUXOPT}" || chcon --verbose --reference=$(BINDIR)/podman bin/podman-remote
install.man: docs
install ${SELINUXOPT} -d -m 755 $(MANDIR)/man1
diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in
index 5e5789cf5..feca59e94 100644
--- a/contrib/spec/podman.spec.in
+++ b/contrib/spec/podman.spec.in
@@ -389,6 +389,7 @@ popd
install -dp %{buildroot}%{_unitdir}
PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} \
install.bin \
+ install.remote \
install.man \
install.cni \
install.systemd \