From 7e7432e255d178cd77c8e61204181a67016a2416 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Tue, 16 Nov 2004 08:03:19 +0000 Subject: [PATCH] Makefile.am (doxygen, [...]): Use host_alias instead of build_alias. 2004-11-16 Matthias Klose * Makefile.am (doxygen, doxygen-maint, doxygen-man): Use host_alias instead of build_alias. * docs/doxygen/run_doxygen: Likewise. * docs/doxygen/user.cfg.in: Likewise. * Makefile.in: Regenerate. From-SVN: r90719 --- libstdc++-v3/ChangeLog | 8 ++++++++ libstdc++-v3/Makefile.am | 6 +++--- libstdc++-v3/Makefile.in | 6 +++--- libstdc++-v3/docs/doxygen/run_doxygen | 16 ++++++++-------- libstdc++-v3/docs/doxygen/user.cfg.in | 2 +- 5 files changed, 23 insertions(+), 15 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index d92c5187e80e..c161f276dcfa 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2004-11-16 Matthias Klose + + * Makefile.am (doxygen, doxygen-maint, doxygen-man): Use host_alias + instead of build_alias. + * docs/doxygen/run_doxygen: Likewise. + * docs/doxygen/user.cfg.in: Likewise. + * Makefile.in: Regenerate. + 2004-11-15 Paolo Carlini * include/bits/streambuf.tcc (__copy_streambufs): Provide diff --git a/libstdc++-v3/Makefile.am b/libstdc++-v3/Makefile.am index 8700fff1b607..c4f589f92c29 100644 --- a/libstdc++-v3/Makefile.am +++ b/libstdc++-v3/Makefile.am @@ -35,21 +35,21 @@ doxygen: -(srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \ builddir=`${PWD_COMMAND}`; \ ${SHELL} ${srcdir}/docs/doxygen/run_doxygen \ - --build_alias=$(build_alias) \ + --host_alias=$${host_alias} \ --mode=user $${srcdir} $${builddir}) doxygen-maint: -(srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \ builddir=`${PWD_COMMAND}`; \ ${SHELL} ${srcdir}/docs/doxygen/run_doxygen \ - --build_alias=$(build_alias) \ + --host_alias=$${host_alias} \ --mode=maint $${srcdir} $${builddir}) doxygen-man: -(srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \ builddir=`${PWD_COMMAND}`; \ ${SHELL} ${srcdir}/docs/doxygen/run_doxygen \ - --build_alias=$(build_alias) \ + --host_alias=$${host_alias} \ --mode=man $${srcdir} $${builddir}) .PHONY: doxygen doxygen-maint doxygen-man diff --git a/libstdc++-v3/Makefile.in b/libstdc++-v3/Makefile.in index 8e019ab5b5f9..d02ba672fd5d 100644 --- a/libstdc++-v3/Makefile.in +++ b/libstdc++-v3/Makefile.in @@ -746,21 +746,21 @@ doxygen: -(srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \ builddir=`${PWD_COMMAND}`; \ ${SHELL} ${srcdir}/docs/doxygen/run_doxygen \ - --build_alias=$(build_alias) \ + --host_alias=$${host_alias} \ --mode=user $${srcdir} $${builddir}) doxygen-maint: -(srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \ builddir=`${PWD_COMMAND}`; \ ${SHELL} ${srcdir}/docs/doxygen/run_doxygen \ - --build_alias=$(build_alias) \ + --host_alias=$${host_alias} \ --mode=maint $${srcdir} $${builddir}) doxygen-man: -(srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \ builddir=`${PWD_COMMAND}`; \ ${SHELL} ${srcdir}/docs/doxygen/run_doxygen \ - --build_alias=$(build_alias) \ + --host_alias=$${host_alias} \ --mode=man $${srcdir} $${builddir}) .PHONY: doxygen doxygen-maint doxygen-man diff --git a/libstdc++-v3/docs/doxygen/run_doxygen b/libstdc++-v3/docs/doxygen/run_doxygen index ec1a9b4e5e1c..ae67cbcb4970 100644 --- a/libstdc++-v3/docs/doxygen/run_doxygen +++ b/libstdc++-v3/docs/doxygen/run_doxygen @@ -3,7 +3,7 @@ # Runs doxygen and massages the output files. # Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc. # -# Synopsis: run_doxygen --mode=[user|maint|man] --build_alias= \ +# Synopsis: run_doxygen --mode=[user|maint|man] --host_alias= \ # v3srcdir v3builddir # # Originally hacked together by Phil Edwards @@ -44,7 +44,7 @@ find_doxygen() { print_usage() { cat 1>&2 <] +Usage: run_doxygen --mode=MODE --host_alias=BUILD_ALIAS [] MODE is one of: user Generate user-level HTML library documentation. @@ -76,9 +76,9 @@ parse_options() { case "$o" in --mode=*) mode=$arg ;; - --build_alias=*) - build_alias=$arg ;; - --mode | --build_alias | --help | -h) + --host_alias=*) + host_alias=$arg ;; + --mode | --host_alias | --help | -h) print_usage ;; *) # this turned out to be a mess, maybe change to --srcdir=, etc @@ -99,7 +99,7 @@ parse_options() { # script begins here mode=unset -build_alias=unset +host_alias=unset srcdir=unset outdir=unset do_html=false @@ -111,7 +111,7 @@ DATEtext=`date '+%Y-%m-%d'` parse_options $* find_doxygen -if test $srcdir = unset || test $outdir = unset || test $mode = unset || test $build_alias = unset; then +if test $srcdir = unset || test $outdir = unset || test $mode = unset || test $host_alias = unset; then # this could be better echo run_doxygen error: You have not given enough information...! 1>&2 print_usage @@ -152,7 +152,7 @@ fi cd $builddir sed -e "s=@outdir@=${outdir}=g" \ -e "s=@srcdir@=${srcdir}=g" \ - -e "s=@build_alias@=${build_alias}=g" \ + -e "s=@host_alias@=${host_alias}=g" \ -e "s=@html_output_dir@=html_${mode}=" \ -e "s=@enabled_sections@=${enabled_sections}=" \ -e "s=@do_html@=${do_html}=" \ diff --git a/libstdc++-v3/docs/doxygen/user.cfg.in b/libstdc++-v3/docs/doxygen/user.cfg.in index 64b5f6d4eac7..de5b2d80c4c2 100644 --- a/libstdc++-v3/docs/doxygen/user.cfg.in +++ b/libstdc++-v3/docs/doxygen/user.cfg.in @@ -113,7 +113,7 @@ INPUT = @srcdir@/docs/doxygen/doxygroups.cc \ include/ext/slist \ include/tr1/array \ include/tr1/tuple \ - include/@build_alias@/bits + include/@host_alias@/bits FILE_PATTERNS = *.h \ *.tcc RECURSIVE = NO -- 2.43.5