From fa3a566378286bcf1fb8157e305ab54034cf3c09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
Date: Thu, 6 Apr 2023 12:20:57 +0200
Subject: [PATCH] update_web_docs_git: Allow setting TEXI2*, add git build
default
maintainer-scripts/ChangeLog:
* update_web_docs_git: Add a mechanism to override makeinfo,
texi2dvi and texi2pdf, and default them to
/home/gccadmin/texinfo/install-git/bin/${tool}, if present.
---
maintainer-scripts/update_web_docs_git | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/maintainer-scripts/update_web_docs_git b/maintainer-scripts/update_web_docs_git
index d44ab27c1b7c..c651e5674247 100755
--- a/maintainer-scripts/update_web_docs_git
+++ b/maintainer-scripts/update_web_docs_git
@@ -14,6 +14,17 @@ export GITROOT
PATH=/usr/local/bin:$PATH
+makeinfo_git=/home/gccadmin/texinfo/install-git/bin/
+if [ -x "${makeinfo_git}"/makeinfo ]; then
+ : "${MAKEINFO:=${makeinfo_git}/makeinfo}"
+ : "${TEXI2DVI:=${makeinfo_git}/texi2dvi}"
+ : "${TEXI2PDF:=${makeinfo_git}/texi2pdf}"
+else
+ : "${MAKEINFO:=makeinfo}"
+ : "${TEXI2DVI:=texi2dvi}"
+ : "${TEXI2PDF:=texi2pdf}"
+fi
+
MANUALS="cpp
cppinternals
fastjar
@@ -174,10 +185,10 @@ for file in $MANUALS; do
elif [ "$file" = "gnat_ugn" ]; then
includes="$includes -I gcc/gcc/ada -I gcc/gcc/ada/doc/gnat_ugn"
fi
- makeinfo --html -c CONTENTS_OUTPUT_LOCATION=inline --css-ref $CSS $includes -o ${file} ${filename}
+ "${MAKEINFO}" --html -c CONTENTS_OUTPUT_LOCATION=inline --css-ref $CSS $includes -o ${file} ${filename}
tar cf ${file}-html.tar ${file}/*.html
- texi2dvi $includes -o ${file}.dvi ${filename} </dev/null >/dev/null && dvips -o ${file}.ps ${file}.dvi
- texi2pdf $includes -o ${file}.pdf ${filename} </dev/null
+ "${TEXI2DVI}" $includes -o ${file}.dvi ${filename} </dev/null >/dev/null && dvips -o ${file}.ps ${file}.dvi
+ "${TEXI2PDF}" $includes -o ${file}.pdf ${filename} </dev/null
mkdir -p $DOCSDIR/$file
fi
done
--
GitLab