diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-11-03 11:24:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-03 11:24:50 +0100 |
| commit | ca4c24cce1345ab8757cd9a590a0f099207150fa (patch) | |
| tree | e3600db6b06cc9a16a068d02ef8bc316381d24c8 | |
| parent | 2bf4df4dbf1c2fc5ad246e19641f9031b3354b7a (diff) | |
| parent | 079164c39193ee35641e2f4b680d8e69fe553625 (diff) | |
| download | podman-ca4c24cce1345ab8757cd9a590a0f099207150fa.tar.gz podman-ca4c24cce1345ab8757cd9a590a0f099207150fa.tar.bz2 podman-ca4c24cce1345ab8757cd9a590a0f099207150fa.zip | |
Merge pull request #4428 from Foxboron/morten/fix-docker-docs
[Makefile] Fix docker documentation install and generation
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | docs/source/markdown/containers-mounts.conf.5.md (renamed from docs/containers-mounts.conf.5.md) | 0 | ||||
| -rw-r--r-- | docs/source/markdown/libpod.conf.5.md (renamed from docs/libpod.conf.5.md) | 0 | ||||
| -rw-r--r-- | docs/source/markdown/podman-remote.conf.5.md (renamed from docs/podman-remote.conf.5.md) | 0 |
4 files changed, 2 insertions, 2 deletions
@@ -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 b/docs/source/markdown/containers-mounts.conf.5.md index 130c1c523..130c1c523 100644 --- a/docs/containers-mounts.conf.5.md +++ b/docs/source/markdown/containers-mounts.conf.5.md diff --git a/docs/libpod.conf.5.md b/docs/source/markdown/libpod.conf.5.md index c28c80b56..c28c80b56 100644 --- a/docs/libpod.conf.5.md +++ b/docs/source/markdown/libpod.conf.5.md diff --git a/docs/podman-remote.conf.5.md b/docs/source/markdown/podman-remote.conf.5.md index e9cc05989..e9cc05989 100644 --- a/docs/podman-remote.conf.5.md +++ b/docs/source/markdown/podman-remote.conf.5.md |