* 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
+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.
+
2001-01-10 Peter Schmid <schmid@snake.iap.physik.tu-darmstadt.de>
* include/bits/std_complex.h: Fix a typo.
CXXLD = $(CXX)
HEADERS = $(glibcppinstall_HEADERS)
-DIST_COMMON = Makefile.am Makefile.in configure configure.in
+DIST_COMMON = ChangeLog Makefile.am Makefile.in configure configure.in
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
## 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
# 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
@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
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;