Merge pull request #1414 from Siosm/develop

Fix manpage generation with python3

Fixes #1388.
This commit is contained in:
Nikolai Aleksandrovich Pavlov 2015-07-19 14:24:02 +03:00
commit 18f3d18c8b
2 changed files with 6 additions and 4 deletions

View File

@ -1,8 +1,8 @@
# Makefile for Sphinx documentation # Makefile for Sphinx documentation
SPHINXOPTS = SPHINXOPTS ?=
SPHINXBUILD = sphinx-build SPHINXBUILD ?= sphinx-build
PAPER = PAPER ?=
BUILDDIR = _build BUILDDIR ?= _build
# Internal variables # Internal variables
PAPEROPT_a4 = -D latex_paper_size=a4 PAPEROPT_a4 = -D latex_paper_size=a4

View File

@ -7,6 +7,8 @@ import codecs
from collections import namedtuple from collections import namedtuple
from functools import reduce
from docutils.parsers.rst import Directive from docutils.parsers.rst import Directive
from docutils.parsers.rst.directives import unchanged_required from docutils.parsers.rst.directives import unchanged_required
from docutils import nodes from docutils import nodes