unofficial mirror of notmuch@notmuchmail.org
 help / color / mirror / code / Atom feed
* [PATCH] doc: drop use of env with sphinx-build
@ 2021-12-04 18:38 David Bremner
  2021-12-23  0:54 ` David Bremner
  0 siblings, 1 reply; 2+ messages in thread
From: David Bremner @ 2021-12-04 18:38 UTC (permalink / raw)
  To: notmuch

NOTMUCH_BUILDDIR is not defined in make, only in test scripts, so this
cannot be doing any good. Without the notmuch2 python module
installed, it the docs still build, so removing the use of env seems
to do no harm.

This is a partial revert of 2739549c
---
 doc/Makefile.local | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/Makefile.local b/doc/Makefile.local
index 730ad4fb..a8e25037 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   = env LD_LIBRARY_PATH=${NOTMUCH_BUILDDIR}/lib sphinx-build
+SPHINXBUILD   = sphinx-build
 DOCBUILDDIR      := $(dir)/_build
 
 # Internal variables.
-- 
2.33.0

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] doc: drop use of env with sphinx-build
  2021-12-04 18:38 [PATCH] doc: drop use of env with sphinx-build David Bremner
@ 2021-12-23  0:54 ` David Bremner
  0 siblings, 0 replies; 2+ messages in thread
From: David Bremner @ 2021-12-23  0:54 UTC (permalink / raw)
  To: notmuch

David Bremner <david@tethera.net> writes:

> NOTMUCH_BUILDDIR is not defined in make, only in test scripts, so this
> cannot be doing any good. Without the notmuch2 python module
> installed, it the docs still build, so removing the use of env seems
> to do no harm.
>
> This is a partial revert of 2739549c

It's true that NOTMUCH_BUILDDIR is not defined in make, but I now
understand what that change was trying to accomplish. Autodoc wants to
load the python module, which in turn wants to load the notmuch shared
library. So somehow the doc build needs to find the shared library.

> ---
>  doc/Makefile.local | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/doc/Makefile.local b/doc/Makefile.local
> index 730ad4fb..a8e25037 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   = env LD_LIBRARY_PATH=${NOTMUCH_BUILDDIR}/lib sphinx-build
> +SPHINXBUILD   = sphinx-build
>  DOCBUILDDIR      := $(dir)/_build
>  
>  # Internal variables.
> -- 
> 2.33.0

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-12-23  0:54 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-04 18:38 [PATCH] doc: drop use of env with sphinx-build David Bremner
2021-12-23  0:54 ` David Bremner

Code repositories for project(s) associated with this inbox:

	notmuch.git.git (no URL configured)

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).