From be657471e761462d91c62e8cd00519e5dbda82a0 Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Tue, 29 Aug 2023 17:25:10 +0200 Subject: Documentation/PDF: always use the configured doxygen executable ... to create the LaTeX header file used by doxygen. This fix applies to both configure/make and CMake. The existing version used `doxygen` which erroneously ran the doxygen version from the current 'PATH' which might issue doxygen warnings and potentially create a wrong LaTeX header file if the configured doxygen program was not the one in the user's path. --- documentation/make_header | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to 'documentation/make_header') diff --git a/documentation/make_header b/documentation/make_header index 44af365dc..a8909b85a 100755 --- a/documentation/make_header +++ b/documentation/make_header @@ -8,12 +8,16 @@ # # Usage: # -# $ sh make_header input-file output-file +# $ sh make_header doxygen_path input-file output-file # -# where 'input-file' is the pure (LaTeX) title page (template) -# and 'output-file' is the generated (LaTeX) title page (template) -# to be used by `make' or `cmake` to generate the final LaTeX page -# header (combined doxygen template + FLTK title page). +# where +# - 'doxygen_path' is the full path to the doxygen executable +# or just 'doxygen'. If the full path is used an arbitrary +# doxygen executable and thus doxygen version can be used. +# - 'input-file' is the pure (LaTeX) title page (template) +# - 'output-file' is the generated (LaTeX) title page (template) +# that is used by `make' or `cmake` to generate the final LaTeX +# page header (combined doxygen template + FLTK title page). # #======================================================================= # This script requires a posix shell and uses the following commands: @@ -21,8 +25,9 @@ #======================================================================= # input and output file names -FLTK_HEAD="$1" -DOXY_HEAD="$2" +DOXY_CMD="$1" +FLTK_HEAD="$2" +DOXY_HEAD="$3" # temp file DOXY_TEMP="doxy-header.tex.$$" @@ -43,7 +48,7 @@ fi # with our PDF document title page (LaTeX code) and write the # result to $DOXY_HEAD. -doxygen -w latex $DOXY_TEMP /dev/null /dev/null +$DOXY_CMD -w latex $DOXY_TEMP /dev/null /dev/null # combine three parts of these files to the output file # using '( ... ) > $DOXY_HEAD' to write (concatenate) -- cgit v1.2.3