diff options
| author | David Bremner <david@tethera.net> | 2019-06-11 20:41:35 -0300 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2019-06-11 20:41:35 -0300 |
| commit | 0a2929c341b6d5f20210725facf37a6e2c3a19b4 (patch) | |
| tree | 7ba85c93e6cb13d553092db938e01e842b7984cc /doc | |
| parent | 38dacf009c4feb5d4820bbdd9222d7e7be067903 (diff) | |
| parent | 20842dfb6d64f4469c554525ab4c27c6571fbdfe (diff) | |
Merge branch 'release'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/Makefile.local | 8 | ||||
| -rw-r--r-- | doc/conf.py | 7 |
2 files changed, 10 insertions, 5 deletions
diff --git a/doc/Makefile.local b/doc/Makefile.local index 719172fe..d733b51e 100644 --- a/doc/Makefile.local +++ b/doc/Makefile.local @@ -4,7 +4,7 @@ dir := doc # You can set these variables from the command line. SPHINXOPTS := -q -SPHINXBUILD = HAVE_EMACS=${HAVE_EMACS} sphinx-build +SPHINXBUILD = HAVE_EMACS=${HAVE_EMACS} WITH_EMACS=${WITH_EMACS} sphinx-build DOCBUILDDIR := $(dir)/_build # Internal variables. @@ -28,7 +28,11 @@ MAN_GZIP_FILES := $(addsuffix .gz,${MAN_ROFF_FILES}) MAN1_TEXI := $(patsubst $(srcdir)/doc/man1/%.rst,$(DOCBUILDDIR)/texinfo/%.texi,$(MAN1_RST)) MAN5_TEXI := $(patsubst $(srcdir)/doc/man5/%.rst,$(DOCBUILDDIR)/texinfo/%.texi,$(MAN5_RST)) MAN7_TEXI := $(patsubst $(srcdir)/doc/man7/%.rst,$(DOCBUILDDIR)/texinfo/%.texi,$(MAN7_RST)) -INFO_TEXI_FILES := $(MAN1_TEXI) $(MAN5_TEXI) $(MAN7_TEXI) $(DOCBUILDDIR)/texinfo/notmuch-emacs.texi +INFO_TEXI_FILES := $(MAN1_TEXI) $(MAN5_TEXI) $(MAN7_TEXI) +ifeq ($(HAVE_EMACS)$(WITH_EMACS),11) + INFO_TEXI_FILES := $(INFO_TEXI_FILES) $(DOCBUILDDIR)/texinfo/notmuch-emacs.texi +endif + INFO_INFO_FILES := $(INFO_TEXI_FILES:.texi=.info) .PHONY: sphinx-html sphinx-texinfo sphinx-info diff --git a/doc/conf.py b/doc/conf.py index 5f8c9f1c..8afff929 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -29,9 +29,10 @@ release = version # directories to ignore when looking for source files. exclude_patterns = ['_build'] -# If we don't have emacs, don't build the notmuch-emacs docs, as they need -# emacs to generate the docstring include files -if os.environ.get('HAVE_EMACS') != '1': +# If we don't have emacs (or the user configured --without-emacs), +# don't build the notmuch-emacs docs, as they need emacs to generate +# the docstring include files +if os.environ.get('HAVE_EMACS') != '1' or os.environ.get('WITH_EMACS') != '1': exclude_patterns.append('notmuch-emacs.rst') # The name of the Pygments (syntax highlighting) style to use. |