Merge pull request #3152 from rhatdan/remote

install.remote should be separate for install.bin
containers · May 20, 2019 · 9567d87 · 9567d87
2 parents 0804b28 + 6154ba4
commit 9567d87
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git 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
@@ -387,6 +387,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 \