diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-03-31 23:05:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-31 23:05:50 +0200 |
| commit | 5798102679cc6e7def72c33f1a6ec0782ff195ee (patch) | |
| tree | 6a9cf6353eec9d45ada627daded6eb6b53b3464f | |
| parent | 2e72b13823f1be199e483f34899723819d1dc474 (diff) | |
| parent | 7801072851315cd1409d5d82a5e649659aa06b79 (diff) | |
| download | podman-5798102679cc6e7def72c33f1a6ec0782ff195ee.tar.gz podman-5798102679cc6e7def72c33f1a6ec0782ff195ee.tar.bz2 podman-5798102679cc6e7def72c33f1a6ec0782ff195ee.zip | |
Merge pull request #9898 from Foxboron/morten/fix-makefile
[CI:DOCS] Makefile: Fix make install.docker regression
| -rw-r--r-- | Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -545,18 +545,22 @@ 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 install.docker-docs: docker-docs install.docker-docs-nobuild +.PHONY: install.docker-full +install.docker-full: install.docker install.docker-docs + .PHONY: install.systemd ifneq (,$(findstring systemd,$(BUILDTAGS))) install.systemd: |