summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-06-18 06:01:11 -0400
committerGitHub <noreply@github.com>2020-06-18 06:01:11 -0400
commitd0b3035c3e6ad6ab79c811c567c2222b9e4470f1 (patch)
treeb01adeee0dbf50bdc97facbfc8bde372234f6562
parent6472b44c3420fbba04dc3b5fe96be6576ee43e61 (diff)
parent30c0fc9f12c6e8c1b97b7f1e57173ac1b4f73b5d (diff)
downloadpodman-d0b3035c3e6ad6ab79c811c567c2222b9e4470f1.tar.gz
podman-d0b3035c3e6ad6ab79c811c567c2222b9e4470f1.tar.bz2
podman-d0b3035c3e6ad6ab79c811c567c2222b9e4470f1.zip
Merge pull request #6611 from lsm5/fix-Makefile-for-varlink
Makefile: install.varlink needs to create dirs
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 2ac6f426f..43e248233 100644
--- a/Makefile
+++ b/Makefile
@@ -568,6 +568,7 @@ install.docker: docker-docs
.PHONY: install.varlink
ifneq (,$(findstring varlink,$(BUILDTAGS)))
install.varlink:
+ install ${SELINUXOPT} -m 755 -d ${DESTDIR}${SYSTEMDDIR} ${DESTDIR}${USERSYSTEMDDIR} ${DESTDIR}${TMPFILESDIR}
install ${SELINUXOPT} -m 644 contrib/varlink/io.podman.socket ${DESTDIR}${SYSTEMDDIR}/io.podman.socket
install ${SELINUXOPT} -m 644 contrib/varlink/io.podman.socket ${DESTDIR}${USERSYSTEMDDIR}/io.podman.socket
install ${SELINUXOPT} -m 644 contrib/varlink/io.podman.service ${DESTDIR}${SYSTEMDDIR}/io.podman.service
@@ -582,8 +583,7 @@ endif
.PHONY: install.systemd
install.systemd: install.varlink
- install ${SELINUXOPT} -m 755 -d ${DESTDIR}${SYSTEMDDIR} ${DESTDIR}${USERSYSTEMDDIR} ${DESTDIR}${TMPFILESDIR}
- install ${SELINUXOPT} -d ${DESTDIR}${USERSYSTEMDDIR}
+ install ${SELINUXOPT} -m 755 -d ${DESTDIR}${SYSTEMDDIR} ${DESTDIR}${USERSYSTEMDDIR}
# Install APIV2 services
install ${SELINUXOPT} -m 644 contrib/systemd/user/podman.socket ${DESTDIR}${USERSYSTEMDDIR}/podman.socket
install ${SELINUXOPT} -m 644 contrib/systemd/user/podman.service ${DESTDIR}${USERSYSTEMDDIR}/podman.service