forked from ungleich-public/cdist
		
	Merge branch 'evilham-compatibility-fixes' into 'master'
Improve Makefile compatibility and build docs See merge request ungleich-public/cdist!1012
This commit is contained in:
		
				commit
				
					
						7ce68e3cb7
					
				
			
		
					 2 changed files with 4 additions and 4 deletions
				
			
		
							
								
								
									
										6
									
								
								Makefile
									
										
									
									
									
								
							
							
						
						
									
										6
									
								
								Makefile
									
										
									
									
									
								
							| 
						 | 
				
			
			@ -35,9 +35,9 @@ DOCS_SRC_DIR=./docs/src
 | 
			
		|||
SPEECHDIR=./docs/speeches
 | 
			
		||||
TYPEDIR=./cdist/conf/type
 | 
			
		||||
 | 
			
		||||
SPHINXM=make -C $(DOCS_SRC_DIR) man
 | 
			
		||||
SPHINXH=make -C $(DOCS_SRC_DIR) html
 | 
			
		||||
SPHINXC=make -C $(DOCS_SRC_DIR) clean
 | 
			
		||||
SPHINXM=$(MAKE) -C $(DOCS_SRC_DIR) man
 | 
			
		||||
SPHINXH=$(MAKE) -C $(DOCS_SRC_DIR) html
 | 
			
		||||
SPHINXC=$(MAKE) -C $(DOCS_SRC_DIR) clean
 | 
			
		||||
 | 
			
		||||
################################################################################
 | 
			
		||||
# Manpages
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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)
 | 
			
		||||
 * Python >= 3.5
 | 
			
		||||
 * 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
 | 
			
		||||
~~~~~~~~~~~~
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue