summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMorten Linderud <morten@linderud.pw>2021-03-31 00:33:46 +0200
committerMatthew Heon <mheon@redhat.com>2021-04-16 13:31:17 -0400
commitf78d8d9cbaa8c452e4e37c00389b65caf393eb5d (patch)
tree49ea22075a5571ccbf28054c4cd12d61ce7e7f45
parent0d049e93a434e24fed8e0725c908e3a25cabb33b (diff)
downloadpodman-f78d8d9cbaa8c452e4e37c00389b65caf393eb5d.tar.gz
podman-f78d8d9cbaa8c452e4e37c00389b65caf393eb5d.tar.bz2
podman-f78d8d9cbaa8c452e4e37c00389b65caf393eb5d.zip
Makefile: ensure install.docker creates BINDIR
Commit 3908c00799fe2af1a12c9c4f4be8b49dbdecd9be introduces a split for installing the docker binary and the docker documentation. The install line creating BINDIR and MANDIR was both moved to the install.docker-docs path which makes `install.docker` fail. Signed-off-by: Morten Linderud <morten@linderud.pw>
-rw-r--r--Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 14e428397..ead90e82a 100644
--- a/Makefile
+++ b/Makefile
@@ -544,13 +544,14 @@ install.cni:
.PHONY: install.docker
install.docker:
+ install ${SELINUXOPT} -d -m 755 $(DESTDIR)$(BINDIR)
install ${SELINUXOPT} -m 755 docker $(DESTDIR)$(BINDIR)/docker
install ${SELINUXOPT} -m 755 -d ${DESTDIR}${SYSTEMDDIR} ${DESTDIR}${USERSYSTEMDDIR} ${DESTDIR}${TMPFILESDIR}
install ${SELINUXOPT} -m 644 contrib/systemd/system/podman-docker.conf -t ${DESTDIR}${TMPFILESDIR}
.PHONY: install.docker-docs-nobuild
install.docker-docs-nobuild:
- install ${SELINUXOPT} -d -m 755 $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1
+ install ${SELINUXOPT} -d -m 755 $(DESTDIR)$(MANDIR)/man1
install ${SELINUXOPT} -m 644 docs/build/man/docker*.1 -t $(DESTDIR)$(MANDIR)/man1
.PHONY: install.docker-docs