Merge pull request #4428 from Foxboron/morten/fix-docker-docs

[Makefile] Fix docker documentation install and generation
containers · Nov 3, 2019 · ca4c24c · ca4c24c
2 parents 2bf4df4 + 079164c
commit ca4c24c
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -376,7 +376,7 @@ podman-remote-%-release:
 	$(MAKE) podman-remote-v$(RELEASE_NUMBER)-$*.zip
 
 docker-docs: docs
-	(cd docs; ./dckrman.sh *.1)
+	(cd docs; ./dckrman.sh ./build/man/*.1)
 
 changelog: ## Generate changelog
 	@echo "Creating changelog from $(CHANGELOG_BASE) to $(CHANGELOG_TARGET)"
@@ -425,7 +425,7 @@ install.cni:
 install.docker: docker-docs
 	install ${SELINUXOPT} -d -m 755 $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1
 	install ${SELINUXOPT} -m 755 docker $(DESTDIR)$(BINDIR)/docker
-	install ${SELINUXOPT} -m 644 docs/docker*.1 -t $(DESTDIR)$(MANDIR)/man1
+	install ${SELINUXOPT} -m 644 docs/build/man/docker*.1 -t $(DESTDIR)$(MANDIR)/man1
 
 install.systemd:
 	install ${SELINUXOPT} -m 755 -d ${DESTDIR}${SYSTEMDDIR}  ${DESTDIR}${USERSYSTEMDDIR} ${DESTDIR}${TMPFILESDIR}

diff --git a/docs/containers-mounts.conf.5.md → ...urce/markdown/containers-mounts.conf.5.md b/docs/containers-mounts.conf.5.md → ...urce/markdown/containers-mounts.conf.5.md
diff --git a/docs/libpod.conf.5.md → docs/source/markdown/libpod.conf.5.md b/docs/libpod.conf.5.md → docs/source/markdown/libpod.conf.5.md
diff --git a/docs/podman-remote.conf.5.md → docs/source/markdown/podman-remote.conf.5.md b/docs/podman-remote.conf.5.md → docs/source/markdown/podman-remote.conf.5.md