public inbox for libstdc++-cvs@sourceware.org
help / color / mirror / Atom feed
From: Jonathan Wakely <redi@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org
Subject: [gcc r11-9174] libstdc++: Fix doxygen generation to work with relative paths
Date: Tue, 19 Oct 2021 15:41:49 +0000 (GMT) [thread overview]
Message-ID: <20211019154149.EB4D33858409@sourceware.org> (raw)
https://gcc.gnu.org/g:e8dd7ce5d279403705f8aa85bb4a2b2f11f3e887
commit r11-9174-ge8dd7ce5d279403705f8aa85bb4a2b2f11f3e887
Author: Jonathan Wakely <jwakely@redhat.com>
Date: Tue Oct 19 16:00:13 2021 +0100
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.
(cherry picked from commit 04d392e8430ca66a3f12b7db4f3cb84788269a48)
Diff:
---
libstdc++-v3/doc/Makefile.am | 20 ++++++++++++--------
libstdc++-v3/doc/Makefile.in | 20 ++++++++++++--------
2 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/libstdc++-v3/doc/Makefile.am b/libstdc++-v3/doc/Makefile.am
index 487e8621b23..0aacf3f27de 100644
--- a/libstdc++-v3/doc/Makefile.am
+++ b/libstdc++-v3/doc/Makefile.am
@@ -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
diff --git a/libstdc++-v3/doc/Makefile.in b/libstdc++-v3/doc/Makefile.in
index fe1113eda34..bfb3ce7ffdf 100644
--- a/libstdc++-v3/doc/Makefile.in
+++ b/libstdc++-v3/doc/Makefile.in
@@ -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
reply other threads:[~2021-10-19 15:41 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211019154149.EB4D33858409@sourceware.org \
--to=redi@gcc.gnu.org \
--cc=gcc-cvs@gcc.gnu.org \
--cc=libstdc++-cvs@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).