From: David Bremner <david@tethera.net>
To: David Bremner <david@tethera.net>, notmuch@notmuchmail.org
Subject: [PATCH 2/2] doc: exclude notmuch-emacs.rst if emacs is not present.
Date: Sun, 21 Apr 2019 20:53:30 -0300 [thread overview]
Message-ID: <20190421235330.23293-2-david@tethera.net> (raw)
In-Reply-To: <20190421235330.23293-1-david@tethera.net>
This will still generate a warning about an excluded document in the
toctree, but it cuts down on the noise quite a lot.
---
doc/Makefile.local | 2 +-
doc/conf.py | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/doc/Makefile.local b/doc/Makefile.local
index 57104dae..651168f4 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 = sphinx-build
+SPHINXBUILD = HAVE_EMACS=${HAVE_EMACS} sphinx-build
DOCBUILDDIR := $(dir)/_build
# Internal variables.
diff --git a/doc/conf.py b/doc/conf.py
index 0ef72327..5f8c9f1c 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -29,6 +29,11 @@ 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':
+ exclude_patterns.append('notmuch-emacs.rst')
+
# The name of the Pygments (syntax highlighting) style to use.
pygments_style = 'sphinx'
--
2.20.1
next prev parent reply other threads:[~2019-04-21 23:53 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-21 17:12 [PATCH 1/4] doc: don't attempt to build info pages if Emacs is missing David Bremner
2019-04-21 17:12 ` [PATCH 2/4] doc: use stamp file to control rebuilding texi David Bremner
2019-04-21 17:12 ` [PATCH 3/4] doc: use stamp file for html docs David Bremner
2019-04-23 21:34 ` Daniel Kahn Gillmor
2019-04-24 10:06 ` David Bremner
2019-04-21 17:12 ` [PATCH 4/4] build: ignore *.stamp David Bremner
2019-04-21 23:53 ` [PATCH 1/2] build: only try to build .rsti files if we have emacs and sphinx David Bremner
2019-04-21 23:53 ` David Bremner [this message]
2019-04-21 22:57 ` [PATCH 1/4] doc: don't attempt to build info pages if Emacs is missing David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190421235330.23293-2-david@tethera.net \
--to=david@tethera.net \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).