sparrowhawk/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'evilham-compatibility-fixes' into 'master'

Browse source 
Improve Makefile compatibility and build docs

See merge request ungleich-public/cdist!1012
This commit is contained in:
poljakowski 2021-07-24 12:52:41 +02:00
commit 7ce68e3cb7
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Makefile
View file

@ -35,9 +35,9 @@ DOCS_SRC_DIR=./docs/src
SPEECHDIR=./docs/speeches SPEECHDIR=./docs/speeches
TYPEDIR=./cdist/conf/type TYPEDIR=./cdist/conf/type
SPHINXM=make -C $(DOCS_SRC_DIR) man SPHINXM=$(MAKE) -C $(DOCS_SRC_DIR) man
SPHINXH=make -C $(DOCS_SRC_DIR) html SPHINXH=$(MAKE) -C $(DOCS_SRC_DIR) html
SPHINXC=make -C $(DOCS_SRC_DIR) clean SPHINXC=$(MAKE) -C $(DOCS_SRC_DIR) clean
################################################################################ ################################################################################
# Manpages # Manpages

2
docs/src/cdist-install.rst
View file

@ -12,7 +12,7 @@ This is the machine from which you will configure target hosts.
* /bin/sh: A POSIX like shell (for instance bash, dash, zsh) * /bin/sh: A POSIX like shell (for instance bash, dash, zsh)
* Python >= 3.5 * Python >= 3.5
* SSH client * SSH client
* sphinx (for building html docs and/or the man pages) * sphinx with the rtd theme (for building html docs and/or the man pages)
Target Hosts Target Hosts
~~~~~~~~~~~~ ~~~~~~~~~~~~