diff options
| author | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-01-11 07:27:50 +0000 |
|---|---|---|
| committer | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-01-11 07:27:50 +0000 |
| commit | ee9fff4ed02a947cb40ddd86befdf607669e4400 (patch) | |
| tree | a930f135f45e53d4fe70a7db3d183d9f0cc3b0c8 /libstdc++-v3/src | |
| parent | 3a5c4f9f3b5dcf832f51026c2cd31eaa9d235153 (diff) | |
| download | gcc-ee9fff4ed02a947cb40ddd86befdf607669e4400.tar.gz | |
2001-01-10 Benjamin Kosnik <bkoz@redhat.com>
* src/ios.cc: Fix typo: change cout->wcout.
* src/Makefile.am (targetincludep): Fix for version-specific-libs.
* src/Makefile.in: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@38895 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/src')
| -rw-r--r-- | libstdc++-v3/src/Makefile.am | 7 | ||||
| -rw-r--r-- | libstdc++-v3/src/Makefile.in | 5 | ||||
| -rw-r--r-- | libstdc++-v3/src/ios.cc | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am index a6e15d1c0eb..b66c6ee6f6e 100644 --- a/libstdc++-v3/src/Makefile.am +++ b/libstdc++-v3/src/Makefile.am @@ -21,7 +21,7 @@ ## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, ## USA. -## $Id: Makefile.am,v 1.62 2001/01/04 04:21:42 bkoz Exp $ +## $Id: Makefile.am,v 1.63 2001/01/10 17:24:11 bkoz Exp $ AUTOMAKE_OPTIONS = 1.3 gnits MAINT_CHARSET = latin1 @@ -225,16 +225,17 @@ $(top_builddir)/stamp-cshadow: $(top_srcdir)/mkinclosure \ # Check for various configure bits that change where the headers get installed. if GXX_INCLUDE_DIR myincludep = @gxx_include_dir@ +targetincludep = @gxx_include_dir@ else if VERSION_SPECIFIC_LIBS myincludep = $(libdir)/gcc-lib/$(target_alias)/@gcc_version@/include/g++ +targetincludep = $(libdir)/gcc-lib/$(target_alias)/@gcc_version@/include/g++ else myincludep = $(prefix)/include/g++-@libstdcxx_interface@ +targetincludep = @gxx_target_include_dir@ endif endif -targetincludep = @gxx_target_include_dir@ - # We have our own special, ridiculously complicated installation routine # here, as automake/autoconf is currently brain-damaged when it comes # to installing sub-directories of headers. In particular, we want to diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in index df23ffb6e27..7b354c2e7f9 100644 --- a/libstdc++-v3/src/Makefile.in +++ b/libstdc++-v3/src/Makefile.in @@ -195,8 +195,9 @@ libstdc___la_DEPENDENCIES = $(libstdc___la_LIBADD) @GXX_INCLUDE_DIR_TRUE@myincludep = @gxx_include_dir@ @GXX_INCLUDE_DIR_FALSE@@VERSION_SPECIFIC_LIBS_TRUE@myincludep = $(libdir)/gcc-lib/$(target_alias)/@gcc_version@/include/g++ @GXX_INCLUDE_DIR_FALSE@@VERSION_SPECIFIC_LIBS_FALSE@myincludep = $(prefix)/include/g++-@libstdcxx_interface@ - -targetincludep = @gxx_target_include_dir@ +@GXX_INCLUDE_DIR_TRUE@targetincludep = @gxx_include_dir@ +@GXX_INCLUDE_DIR_FALSE@@VERSION_SPECIFIC_LIBS_TRUE@targetincludep = $(libdir)/gcc-lib/$(target_alias)/@gcc_version@/include/g++ +@GXX_INCLUDE_DIR_FALSE@@VERSION_SPECIFIC_LIBS_FALSE@targetincludep = @gxx_target_include_dir@ # NB: As libio_headers may be empty, need this to make sure bash doesn't # choke on an empty for... loop by using libio_headers_install diff --git a/libstdc++-v3/src/ios.cc b/libstdc++-v3/src/ios.cc index 83ff7ca3aa5..db694786a3f 100644 --- a/libstdc++-v3/src/ios.cc +++ b/libstdc++-v3/src/ios.cc @@ -158,7 +158,7 @@ namespace std new (&wcin) wistream(_M_wcin); new (&wcerr) wostream(_M_wcerr); new (&wclog) wostream(_M_wcerr); - wcin.tie(&cout); + wcin.tie(&wcout); wcerr.flags(ios_base::unitbuf); #endif ios_base::Init::_S_synced_with_stdio = true; |