From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id yKkuN7S8CV8sEgAA0tVLHw (envelope-from ) for ; Sat, 11 Jul 2020 13:20:52 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id IJ4OM7S8CV+CQQAAB5/wlQ (envelope-from ) for ; Sat, 11 Jul 2020 13:20:52 +0000 Received: from mail.notmuchmail.org (nmbug.tethera.net [144.217.243.247]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id E78859403AD for ; Sat, 11 Jul 2020 13:20:49 +0000 (UTC) Received: from [144.217.243.247] (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 726231FCAF; Sat, 11 Jul 2020 09:20:39 -0400 (EDT) Received: from fethera.tethera.net (fethera.tethera.net [IPv6:2607:5300:60:c5::1]) by mail.notmuchmail.org (Postfix) with ESMTP id 3A59E1FCA6 for ; Sat, 11 Jul 2020 09:20:36 -0400 (EDT) Received: by fethera.tethera.net (Postfix, from userid 1001) id EAEC7613B0; Sat, 11 Jul 2020 09:20:33 -0400 (EDT) Received: (nullmailer pid 1449141 invoked by uid 1000); Sat, 11 Jul 2020 13:20:32 -0000 From: David Bremner To: notmuch@notmuchmail.org Cc: flub@devork.be, David Bremner Subject: [PATCH 1/2] doc: replace use of environment variables with a generated config Date: Sat, 11 Jul 2020 10:20:26 -0300 Message-Id: <20200711132027.1449094-1-david@tethera.net> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Message-ID-Hash: KVTFNVHLF2X5IR4QQT6LJNBTXKIYU737 X-Message-ID-Hash: KVTFNVHLF2X5IR4QQT6LJNBTXKIYU737 X-MailFrom: bremner@tethera.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-notmuch.notmuchmail.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.1 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 144.217.243.247 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Spam-Score: 1.53 X-TUID: UZiviQBEeVua I don't love the use of exec, but it is getting unwieldy to pass configuration options on the sphinx-build command line, and I anticipate further use of conditionals. --- configure | 8 ++++++++ doc/Makefile.local | 2 +- doc/conf.py | 11 ++++++++--- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 80cbac4f..177432db 100755 --- a/configure +++ b/configure @@ -1548,6 +1548,14 @@ NOTMUCH_HAVE_PYTHON3_PYTEST=${have_python3_pytest} PLATFORM=${platform} EOF +cat > sphinx.config <> sphinx.config +fi +printf "rsti_dir = '%s'\n" $(realpath emacs) >> sphinx.config + # Finally, after everything configured, inform the user how to continue. cat <