Revert "sphinx: simplify default in baseconf.py."

This reverts commit 8d7a55b7f4ce37ecc869bd31cadc3f9e059e2f44.

diff --git a/doc/baseconf.py b/doc/baseconf.py
index 47e3a1264165f89067c3135c8437b800b97bca1a..f80fdabc8b0e8782314f401c776d0be5752ff6ce 100644 (file)
--- a/doc/baseconf.py
+++ b/doc/baseconf.py
@@ -71,11 +71,13 @@ needs_sphinx = '5.3'
 rst_epilog = '''
 .. |gcc_version| replace:: %s
 .. |needs_sphinx| replace:: %s\n
-.. |bugurl| replace:: %s\n
-.. |package_version| replace:: %s\n
-''' % (gcc_BASEVER, needs_sphinx,
-       BUGURL if BUGURL else 'https://gcc.gnu.org/bugs/',
-       VERSION_PACKAGE if VERSION_PACKAGE else '(GCC)')
+''' % (gcc_BASEVER, needs_sphinx)
+
+if BUGURL:
+    rst_epilog += '.. |bugurl| replace:: %s\n' % BUGURL
+
+if VERSION_PACKAGE:
+    rst_epilog += '.. |package_version| replace:: %s\n' % VERSION_PACKAGE
 
 # -- General configuration ---------------------------------------------------
 
@@ -204,7 +206,6 @@ extlinks = {
 
 extlinks_detect_hardcoded_links = True
 
-
 # Set common settings where we need NAME of the documentation
 def set_common(name, module):
     module['tags'].add(name)

diff --git a/maintainer-scripts/update_web_docs_git.py b/maintainer-scripts/update_web_docs_git.py
index 18c8bbb8324b381d612935070a7bfa27fbf4f79e..f3f59953ac0bb2ff9845bfd8a30b94cd79fa3b81 100755 (executable)
--- a/maintainer-scripts/update_web_docs_git.py
+++ b/maintainer-scripts/update_web_docs_git.py
@@ -10,6 +10,7 @@ import tempfile
 from pathlib import Path
 
 GITROOT = '/git/gcc.git'
+BUGURL = 'https://gcc.gnu.org/bugs/'
 
 parser = argparse.ArgumentParser(description='Update web documentation.')
 parser.add_argument('output_folder', help='Output folder')
@@ -52,6 +53,10 @@ with tempfile.TemporaryDirectory() as folder:
     temp = Path('tmp').resolve()
     temp.mkdir()
 
+    # Prepare default env. variables
+    childenv = os.environ.copy()
+    childenv['BUGURL'] = BUGURL
+
     # Build and copy the documentation
     for i, (config_folder, docname) in enumerate(sorted(configs)):
         print(f'=== building {i + 1}/{len(configs)}: {docname} ===')
@@ -60,7 +65,7 @@ with tempfile.TemporaryDirectory() as folder:
         cmd = f'make -C doc html SOURCEDIR={config_folder} BUILDDIR={temp}/{docname}'
         if args.sphinx_build:
             cmd += f' SPHINXBUILD={args.sphinx_build}'
-        subprocess.run(cmd, shell=True, check=True,
+        subprocess.run(cmd, shell=True, env=childenv, check=True,
                        capture_output=not args.verbose)
         os.unlink(f'{temp}/{docname}/html/.buildinfo')
         shutil.copytree(f'{temp}/{docname}/html', f'{output}/{docname}',
@@ -70,7 +75,7 @@ with tempfile.TemporaryDirectory() as folder:
         cmd = f'make -C doc latexpdf SOURCEDIR={config_folder} BUILDDIR={temp}/pdf/{docname}'
         if args.sphinx_build:
             cmd += f' SPHINXBUILD={args.sphinx_build}'
-        subprocess.run(cmd, shell=True, check=True,
+        subprocess.run(cmd, shell=True, env=childenv, check=True,
                        capture_output=not args.verbose)
         shutil.copyfile(f'{temp}/pdf/{docname}/latex/{docname}.pdf',
                         f'{output}/{docname}.pdf')