From ab3b6df130f5ce21b126a666f5df3bd85aaf4c46 Mon Sep 17 00:00:00 2001 From: Morten Linderud Date: Wed, 31 Mar 2021 00:33:46 +0200 Subject: 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 --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 49250f2fd..c7a91c27e 100644 --- a/Makefile +++ b/Makefile @@ -545,13 +545,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 -- cgit v1.2.3-54-g00ecf From 7801072851315cd1409d5d82a5e649659aa06b79 Mon Sep 17 00:00:00 2001 From: Morten Linderud Date: Wed, 31 Mar 2021 00:35:26 +0200 Subject: Makefile: introduce install.docker-full The split of install.docker and install.docker-docs makes some sense but there should be some way to specify both for packagers. This introduces `make install.docker-full` which installs both the docker binary and the documentation. Signed-off-by: Morten Linderud --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index c7a91c27e..705ac4ded 100644 --- a/Makefile +++ b/Makefile @@ -558,6 +558,9 @@ install.docker-docs-nobuild: .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: -- cgit v1.2.3-54-g00ecf