opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-24 03:08:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9898 from Foxboron/morten/fix-makefile

Browse Source 
[CI:DOCS] Makefile: Fix make install.docker regression
This commit is contained in:
OpenShift Merge Robot
2021-03-31 23:05:50 +02:00
committed by GitHub
parent 2e72b13823 7801072851
commit 5798102679
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -545,18 +545,22 @@ install.cni:
.PHONY: install.docker .PHONY: install.docker
install.docker: install.docker:
install ${SELINUXOPT} -d -m 755 $(DESTDIR)$(BINDIR)
install ${SELINUXOPT} -m 755 docker $(DESTDIR)$(BINDIR)/docker install ${SELINUXOPT} -m 755 docker $(DESTDIR)$(BINDIR)/docker
install ${SELINUXOPT} -m 755 -d ${DESTDIR}${SYSTEMDDIR} ${DESTDIR}${USERSYSTEMDDIR} ${DESTDIR}${TMPFILESDIR} install ${SELINUXOPT} -m 755 -d ${DESTDIR}${SYSTEMDDIR} ${DESTDIR}${USERSYSTEMDDIR} ${DESTDIR}${TMPFILESDIR}
install ${SELINUXOPT} -m 644 contrib/systemd/system/podman-docker.conf -t ${DESTDIR}${TMPFILESDIR} install ${SELINUXOPT} -m 644 contrib/systemd/system/podman-docker.conf -t ${DESTDIR}${TMPFILESDIR}
.PHONY: install.docker-docs-nobuild .PHONY: install.docker-docs-nobuild
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 install ${SELINUXOPT} -m 644 docs/build/man/docker*.1 -t $(DESTDIR)$(MANDIR)/man1
.PHONY: install.docker-docs .PHONY: install.docker-docs
install.docker-docs: docker-docs install.docker-docs-nobuild install.docker-docs: docker-docs install.docker-docs-nobuild
.PHONY: install.docker-full
install.docker-full: install.docker install.docker-docs
.PHONY: install.systemd .PHONY: install.systemd
ifneq (,$(findstring systemd,$(BUILDTAGS))) ifneq (,$(findstring systemd,$(BUILDTAGS)))
install.systemd: install.systemd: