Merge pull request #912 from lucc/docs

Fix building of docs to ease development
pazz · Dec 11, 2016 · 86820ab · 86820ab
2 parents 990b194 + a504468
commit 86820ab
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/docs/Makefile b/docs/Makefile
@@ -6,6 +6,7 @@ SPHINXOPTS    =
 SPHINXBUILD   = sphinx-build
 PAPER         =
 BUILDDIR      = build
+PYTHON        = python
 
 # Internal variables.
 PAPEROPT_a4     = -D latex_paper_size=a4
@@ -43,13 +44,13 @@ help:
 	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
 
 $(COMMAND_OPTION_TABLES): ../alot/commands/__init__.py
-	python source/generate_commands.py
+	$(PYTHON) source/generate_commands.py
 
 $(CONFIG_OPTION_TABLES): ../alot/defaults/alot.rc.spec
-	python source/generate_configs.py
+	$(PYTHON) source/generate_configs.py
 
 clean:
-	-rm -rf $(BUILDDIR)/*
+	-$(RM) -rf $(BUILDDIR)/*
 
 html: $(CONFIG_OPTION_TABLES) $(COMMAND_OPTION_TABLES)
 	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html

diff --git a/docs/source/generate_commands.py b/docs/source/generate_commands.py
@@ -58,7 +58,7 @@ def rstify_parser(parser):
         if len(parser._positionals._group_actions) == 1:
             out += "    argument\n"
             a = parser._positionals._group_actions[0]
-            out += ' '*8 + parser._positionals._group_actions[0].help
+            out += ' '*8 + str(parser._positionals._group_actions[0].help)
             if a.choices:
                 out += ". valid choices are: %s." % ','.join(['\`%s\`' % s for s
                                                               in a.choices])