Skip to content

Commit fa3a566

Browse files
committed
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.
1 parent afc7e20 commit fa3a566

1 file changed

Lines changed: 14 additions & 3 deletions

File tree

maintainer-scripts/update_web_docs_git

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,17 @@ export GITROOT
1414

1515
PATH=/usr/local/bin:$PATH
1616

17+
makeinfo_git=/home/gccadmin/texinfo/install-git/bin/
18+
if [ -x "${makeinfo_git}"/makeinfo ]; then
19+
: "${MAKEINFO:=${makeinfo_git}/makeinfo}"
20+
: "${TEXI2DVI:=${makeinfo_git}/texi2dvi}"
21+
: "${TEXI2PDF:=${makeinfo_git}/texi2pdf}"
22+
else
23+
: "${MAKEINFO:=makeinfo}"
24+
: "${TEXI2DVI:=texi2dvi}"
25+
: "${TEXI2PDF:=texi2pdf}"
26+
fi
27+
1728
MANUALS="cpp
1829
cppinternals
1930
fastjar
@@ -174,10 +185,10 @@ for file in $MANUALS; do
174185
elif [ "$file" = "gnat_ugn" ]; then
175186
includes="$includes -I gcc/gcc/ada -I gcc/gcc/ada/doc/gnat_ugn"
176187
fi
177-
makeinfo --html -c CONTENTS_OUTPUT_LOCATION=inline --css-ref $CSS $includes -o ${file} ${filename}
188+
"${MAKEINFO}" --html -c CONTENTS_OUTPUT_LOCATION=inline --css-ref $CSS $includes -o ${file} ${filename}
178189
tar cf ${file}-html.tar ${file}/*.html
179-
texi2dvi $includes -o ${file}.dvi ${filename} </dev/null >/dev/null && dvips -o ${file}.ps ${file}.dvi
180-
texi2pdf $includes -o ${file}.pdf ${filename} </dev/null
190+
"${TEXI2DVI}" $includes -o ${file}.dvi ${filename} </dev/null >/dev/null && dvips -o ${file}.ps ${file}.dvi
191+
"${TEXI2PDF}" $includes -o ${file}.pdf ${filename} </dev/null
181192
mkdir -p $DOCSDIR/$file
182193
fi
183194
done

0 commit comments

Comments
 (0)