summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/Makefile7
-rwxr-xr-xdocs/source/generate_commands.py2
2 files changed, 5 insertions, 4 deletions
diff --git a/docs/Makefile b/docs/Makefile
index 95de3969..68f7e497 100644
--- 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
index 3731c574..e31c130c 100755
--- 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])