OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libstdc++: Fix doxygen generation to work with relative paths 

In r12-826 I tried to remove some redundant steps from the doxygen
build, but they are needed when configure is run as a relative path. The
use of pwd is to resolve the relative path to an absolute one.

libstdc++-v3/ChangeLog:

	* doc/Makefile.am (stamp-html-doxygen, stamp-html-doxygen)
	(stamp-latex-doxygen, stamp-man-doxygen): Fix recipes for
	relative ${top_srcdir}.
	* doc/Makefile.in: Regenerate.
This commit is contained in:
Jonathan Wakely 2021-10-19 16:00:13 +01:00
parent ff0eec94e8
commit 04d392e843
2 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libstdc++-v3/doc/Makefile.am
View File

@ -226,10 +226,11 @@ ${doxygen_outdir}/man:
mkdir -p ${doxygen_outdir}/man
stamp-xml-doxygen: ${doxygen_outdir}/xml
@builddir=`cd ..; ${PWD_COMMAND}`; \
-srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \
builddir=`cd ..; ${PWD_COMMAND}`; \
${SHELL} ${doxygen_script} \
--host_alias=${host_alias} --mode=xml \
"${top_srcdir}" "$${builddir}" NO || true
"$${srcdir}" "$${builddir}" NO
$(STAMP) stamp-xml-doxygen
stamp-xml-single-doxygen: stamp-xml-doxygen
@ -239,17 +240,19 @@ stamp-xml-single-doxygen: stamp-xml-doxygen
$(STAMP) stamp-xml-single-doxygen
stamp-html-doxygen: ${doxygen_outdir}/html
@builddir=`cd ..; ${PWD_COMMAND}`; \
-srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \
builddir=`cd ..; ${PWD_COMMAND}`; \
${SHELL} ${doxygen_script} \
--host_alias=${host_alias} --mode=html \
"${top_srcdir}" "$${builddir}" YES || true
"$${srcdir}" "$${builddir}" YES
$(STAMP) stamp-html-doxygen
stamp-latex-doxygen: ${doxygen_outdir}/latex
@builddir=`cd ..; ${PWD_COMMAND}`; \
-srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \
builddir=`cd ..; ${PWD_COMMAND}`; \
${SHELL} ${doxygen_script} \
--host_alias=${host_alias} --mode=latex --latex_cmd=$(LATEX_CMD) \
"${top_srcdir}" "$${builddir}" NO || true
"$${srcdir}" "$${builddir}" NO
$(STAMP) stamp-latex-doxygen
# Chance of loooooonnggg creation time on this rule. Iff this fails,
@ -274,10 +277,11 @@ stamp-pdf-doxygen: stamp-latex-doxygen ${doxygen_outdir}/pdf
$(STAMP) stamp-pdf-doxygen
stamp-man-doxygen: ${doxygen_outdir}/man
@builddir=`cd ..; ${PWD_COMMAND}`; \
-srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \
builddir=`cd ..; ${PWD_COMMAND}`; \
${SHELL} ${doxygen_script} \
--host_alias=${host_alias} --mode=man \
"${top_srcdir}" "$${builddir}" YES || true
"$${srcdir}" "$${builddir}" YES
$(STAMP) stamp-man-doxygen
doc-xml-doxygen: stamp-xml-doxygen

20
libstdc++-v3/doc/Makefile.in
View File

@ -917,10 +917,11 @@ ${doxygen_outdir}/man:
mkdir -p ${doxygen_outdir}/man
stamp-xml-doxygen: ${doxygen_outdir}/xml
@builddir=`cd ..; ${PWD_COMMAND}`; \
-srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \
builddir=`cd ..; ${PWD_COMMAND}`; \
${SHELL} ${doxygen_script} \
--host_alias=${host_alias} --mode=xml \
"${top_srcdir}" "$${builddir}" NO || true
"$${srcdir}" "$${builddir}" NO
$(STAMP) stamp-xml-doxygen
stamp-xml-single-doxygen: stamp-xml-doxygen
@ -930,17 +931,19 @@ stamp-xml-single-doxygen: stamp-xml-doxygen
$(STAMP) stamp-xml-single-doxygen
stamp-html-doxygen: ${doxygen_outdir}/html
@builddir=`cd ..; ${PWD_COMMAND}`; \
-srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \
builddir=`cd ..; ${PWD_COMMAND}`; \
${SHELL} ${doxygen_script} \
--host_alias=${host_alias} --mode=html \
"${top_srcdir}" "$${builddir}" YES || true
"$${srcdir}" "$${builddir}" YES
$(STAMP) stamp-html-doxygen
stamp-latex-doxygen: ${doxygen_outdir}/latex
@builddir=`cd ..; ${PWD_COMMAND}`; \
-srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \
builddir=`cd ..; ${PWD_COMMAND}`; \
${SHELL} ${doxygen_script} \
--host_alias=${host_alias} --mode=latex --latex_cmd=$(LATEX_CMD) \
"${top_srcdir}" "$${builddir}" NO || true
"$${srcdir}" "$${builddir}" NO
$(STAMP) stamp-latex-doxygen
# Chance of loooooonnggg creation time on this rule. Iff this fails,
@ -965,10 +968,11 @@ stamp-pdf-doxygen: stamp-latex-doxygen ${doxygen_outdir}/pdf
$(STAMP) stamp-pdf-doxygen
stamp-man-doxygen: ${doxygen_outdir}/man
@builddir=`cd ..; ${PWD_COMMAND}`; \
-srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \
builddir=`cd ..; ${PWD_COMMAND}`; \
${SHELL} ${doxygen_script} \
--host_alias=${host_alias} --mode=man \
"${top_srcdir}" "$${builddir}" YES || true
"$${srcdir}" "$${builddir}" YES
$(STAMP) stamp-man-doxygen
doc-xml-doxygen: stamp-xml-doxygen