Makefile.am (extra_target_headers): New list of all target files built with ad hoc...

	* include/Makefile.am (extra_target_headers): New list of all
	target files built with ad hoc naming rules.
	(stamp-*): Handle LN_S failure in manner portable across make
	implementations.
	(install-data-local): Install header files from human-maintained
	file lists and directory components instead of non-robust find.
	* include/Makefile.in: Rebuilt.

From-SVN: r48782

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 56936cec1f97360fee9663ee58d9fda81e00a5fc..ce6e4414454e314269fedc09ea4b97b38733ee7f 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,13 @@
+2002-01-11  Loren Rittle <ljrittle@acm.org>
+
+       * include/Makefile.am (extra_target_headers): New list of all
+       target files built with ad hoc naming rules.
+       (stamp-*): Handle LN_S failure in manner portable across make
+       implementations.
+       (install-data-local): Install header files from human-maintained
+       file lists and directory components instead of non-robust find.
+       * include/Makefile.in: Rebuilt.
+
 2002-01-11  Benjamin Kosnik  <bkoz@redhat.com>
 
        * include/bits/locale_facets.tcc (money_get::do_get(string)):

diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am
index 1c0bdb3f5042ed510e707a2392b521a886f291fd..1ff45bd8f32ac1ba05970ca5aaac5d3c5363be55 100644 (file)
--- a/libstdc++-v3/include/Makefile.am
+++ b/libstdc++-v3/include/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile for the include subdirectory of the GNU C++ Standard library.
 ##
-## Copyright (C) 2001 Free Software Foundation, Inc.
+## Copyright (C) 2001, 2002 Free Software Foundation, Inc.
 ##
 ## This file is part of the libstdc++ version 3 distribution.
 ## Process this file with automake to produce Makefile.in.
@@ -224,6 +224,14 @@ target_headers = \
        ${target_srcdir}/os_defines.h \
        ${glibcpp_srcdir}/@ATOMICITY_INC_SRCDIR@/atomicity.h \
        ${glibcpp_srcdir}/@CPU_LIMITS_INC_SRCDIR@/cpu_limits.h 
+# These extra_target_headers files are all built with ad hoc naming rules.
+extra_target_headers = \
+       ${target_builddir}/basic_file_model.h \
+       ${target_builddir}/c++config.h \
+       ${target_builddir}/c++io.h \
+       ${target_builddir}/c++locale.h \
+       ${target_builddir}/messages_members.h \
+       ${target_builddir}/codecvt_specializations.h
 
 thread_builddir = ./${target_alias}/bits
 thread_headers = \
@@ -244,35 +252,35 @@ stamp-std: ${std_headers}
        @if [ ! -d "${std_builddir}" ]; then \
          mkdir -p ${std_builddir} ;\
        fi ;\
-       (cd ${std_builddir} && @LN_S@ $? .) ;\
+       (cd ${std_builddir} && @LN_S@ $? . || true) ;\
        echo `date` > stamp-std 
 
 stamp-bits: ${bits_headers}
        @if [ ! -d "${bits_builddir}" ]; then \
          mkdir -p ${bits_builddir} ;\
        fi ;\
-       (cd ${bits_builddir} && @LN_S@ $? .) ;\
+       (cd ${bits_builddir} && @LN_S@ $? . || true) ;\
        echo `date` > stamp-bits
 
 stamp-c_base: ${c_base_headers}
        @if [ ! -d "${c_base_builddir}" ]; then \
          mkdir -p ${c_base_builddir} ;\
        fi ;\
-       (cd ${c_base_builddir} && @LN_S@ $? .) ;\
+       (cd ${c_base_builddir} && @LN_S@ $? . || true) ;\
        echo `date` > stamp-c_base
 
 stamp-backward: ${backward_headers}
        @if [ ! -d "${backward_builddir}" ]; then \
          mkdir -p ${backward_builddir} ;\
        fi ;\
-       (cd ${backward_builddir} && @LN_S@ $? .) ;\
+       (cd ${backward_builddir} && @LN_S@ $? . || true) ;\
        echo `date` > stamp-backward
 
 stamp-ext: ${ext_headers}
        @if [ ! -d "${ext_builddir}" ]; then \
          mkdir -p ${ext_builddir} ;\
        fi ;\
-       (cd ${ext_builddir} && @LN_S@ $? .) ;\
+       (cd ${ext_builddir} && @LN_S@ $? . || true) ;\
        echo `date` > stamp-ext
 
 # This target is special.  The timestamp on a directory gets modified
@@ -290,12 +298,12 @@ stamp-${target_alias}:
 stamp-target: ${target_headers} ${target_builddir}
        @cd ${target_builddir} ;\
        if [ ! -f stamp-target ]; then \
-         @LN_S@ ${target_headers} . ;\
-         @LN_S@ ${glibcpp_srcdir}/@BASIC_FILE_H@ basic_file_model.h ;\
-         @LN_S@ ${glibcpp_srcdir}/@CSTDIO_H@ c++io.h ;\
-         @LN_S@ ${glibcpp_srcdir}/@CLOCALE_H@ c++locale.h ;\
-         @LN_S@ ${glibcpp_srcdir}/@CMESSAGES_H@ messages_members.h ;\
-         @LN_S@ ${glibcpp_srcdir}/@CCODECVT_H@ codecvt_specializations.h ;\
+         @LN_S@ ${target_headers} . || true ;\
+         @LN_S@ ${glibcpp_srcdir}/@BASIC_FILE_H@ basic_file_model.h || true ;\
+         @LN_S@ ${glibcpp_srcdir}/@CSTDIO_H@ c++io.h || true ;\
+         @LN_S@ ${glibcpp_srcdir}/@CLOCALE_H@ c++locale.h || true ;\
+         @LN_S@ ${glibcpp_srcdir}/@CMESSAGES_H@ messages_members.h || true ;\
+         @LN_S@ ${glibcpp_srcdir}/@CCODECVT_H@ codecvt_specializations.h || true ;\
          echo `date` > stamp-target; \
        fi
 
@@ -335,18 +343,38 @@ ${thread_builddir}/gthr-default.h:
            -e 's/\(${uppercase}*WEAK\)/_GLIBCPP_\1/g' \
            < ${toplevel_srcdir}/gcc/${glibcpp_thread_h} > $@
 
-# One big happy istallation:  just copy everything from the build to the
-# install tree (except for the build stamps).
+# For robustness sake (in light of junk files or in-source
+# configuration), copy from the build or source tree to the install
+# tree using only the human-maintained file lists and directory
+# components.  Yes, with minor differences, this is sheer duplication
+# of the staging rules above using $(INSTALL_DATA) instead of LN_S and
+# `$(INSTALL) -d' instead of `mkdir -p'.  In particular,
+# extra_target_headers are taken out of the build tree staging area;
+# the rest are taken from the original source tree.
 gxx_include_dir = @gxx_include_dir@
 install-data-local:
-       for file in `find . ! -name stamp-\* ! -name Makefile -print`; do \
-       installFile=${gxx_include_dir}/$${file} ;\
-       if [ -d $${file} ]; then \
-         $(INSTALL) -d $${installFile} ;\
-       else \
-         $(INSTALL_DATA) $${file} $${installFile} ;\
-       fi ;\
-       done
+       $(INSTALL) -d ${gxx_include_dir}
+       $(INSTALL) -d ${gxx_include_dir}/${bits_builddir}
+       for file in ${bits_headers}; do \
+         $(INSTALL_DATA) $${file} ${gxx_include_dir}/${bits_builddir}; done
+       $(INSTALL) -d ${gxx_include_dir}/${backward_builddir}
+       for file in ${backward_headers}; do \
+         $(INSTALL_DATA) $${file} ${gxx_include_dir}/${backward_builddir}; done
+       $(INSTALL) -d ${gxx_include_dir}/${ext_builddir}
+       for file in ${ext_headers}; do \
+         $(INSTALL_DATA) $${file} ${gxx_include_dir}/${ext_builddir}; done
+       $(INSTALL) -d ${gxx_include_dir}/${c_base_builddir}
+       for file in ${c_base_headers}; do \
+         $(INSTALL_DATA) $${file} ${gxx_include_dir}/${c_base_builddir}; done
+       $(INSTALL) -d ${gxx_include_dir}/${std_builddir}
+       for file in ${std_headers}; do \
+         $(INSTALL_DATA) $${file} ${gxx_include_dir}/${std_builddir}; done
+       $(INSTALL) -d ${gxx_include_dir}/${target_builddir}
+       for file in ${target_headers} ${extra_target_headers}; do \
+         $(INSTALL_DATA) $${file} ${gxx_include_dir}/${target_builddir}; done
+       $(INSTALL) -d ${gxx_include_dir}/${thread_builddir}
+       for file in ${thread_headers}; do \
+         $(INSTALL_DATA) $${file} ${gxx_include_dir}/${thread_builddir}; done
 
 # By adding these files here, automake will remove them for 'make clean'
 #CLEANFILES = ${allstamps}

diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in
index 53f2d079a1a95f18414bc5915615ca1c65612332..70fee33be73cc1c8a128f1e1d2f2ba23e4977e13 100644 (file)
--- a/libstdc++-v3/include/Makefile.in
+++ b/libstdc++-v3/include/Makefile.in
@@ -158,223 +158,59 @@ glibcpp_builddir = @glibcpp_builddir@
 
 bits_srcdir = ${glibcpp_srcdir}/include/bits
 bits_builddir = ./bits
-bits_headers = \
-       ${bits_srcdir}/basic_file.h \
-       ${bits_srcdir}/basic_ios.h \
-       ${bits_srcdir}/basic_ios.tcc \
-       ${bits_srcdir}/basic_string.h \
-       ${bits_srcdir}/basic_string.tcc \
-       ${bits_srcdir}/boost_concept_check.h \
-       ${bits_srcdir}/char_traits.h \
-       ${bits_srcdir}/codecvt.h \
-       ${bits_srcdir}/concept_check.h \
-       ${bits_srcdir}/cpp_type_traits.h \
-       ${bits_srcdir}/fpos.h \
-       ${bits_srcdir}/fstream.tcc \
-       ${bits_srcdir}/functexcept.h \
-       ${bits_srcdir}/generic_shadow.h \
-       ${bits_srcdir}/gslice.h \
-       ${bits_srcdir}/gslice_array.h \
-       ${bits_srcdir}/indirect_array.h \
-       ${bits_srcdir}/ios_base.h \
-       ${bits_srcdir}/istream.tcc \
-       ${bits_srcdir}/locale_facets.h \
-       ${bits_srcdir}/locale_facets.tcc \
-       ${bits_srcdir}/localefwd.h \
-       ${bits_srcdir}/mask_array.h \
-       ${bits_srcdir}/ostream.tcc \
-       ${bits_srcdir}/pthread_allocimpl.h \
-       ${bits_srcdir}/stream_iterator.h \
-       ${bits_srcdir}/streambuf_iterator.h \
-       ${bits_srcdir}/slice.h \
-       ${bits_srcdir}/slice_array.h \
-       ${bits_srcdir}/sstream.tcc \
-       ${bits_srcdir}/stl_algo.h \
-       ${bits_srcdir}/stl_algobase.h \
-       ${bits_srcdir}/stl_alloc.h \
-       ${bits_srcdir}/stl_bvector.h \
-       ${bits_srcdir}/stl_construct.h \
-       ${bits_srcdir}/stl_deque.h \
-       ${bits_srcdir}/stl_function.h \
-       ${bits_srcdir}/stl_heap.h \
-       ${bits_srcdir}/stl_iterator.h \
-       ${bits_srcdir}/stl_iterator_base_funcs.h \
-       ${bits_srcdir}/stl_iterator_base_types.h \
-       ${bits_srcdir}/stl_list.h \
-       ${bits_srcdir}/stl_map.h \
-       ${bits_srcdir}/stl_multimap.h \
-       ${bits_srcdir}/stl_multiset.h \
-       ${bits_srcdir}/stl_numeric.h \
-       ${bits_srcdir}/stl_pair.h \
-       ${bits_srcdir}/stl_pthread_alloc.h \
-       ${bits_srcdir}/stl_queue.h \
-       ${bits_srcdir}/stl_raw_storage_iter.h \
-       ${bits_srcdir}/stl_relops.h \
-       ${bits_srcdir}/stl_set.h \
-       ${bits_srcdir}/stl_stack.h \
-       ${bits_srcdir}/stl_tempbuf.h \
-       ${bits_srcdir}/stl_threads.h \
-       ${bits_srcdir}/stl_tree.h \
-       ${bits_srcdir}/stl_uninitialized.h \
-       ${bits_srcdir}/stl_vector.h \
-       ${bits_srcdir}/streambuf.tcc \
-       ${bits_srcdir}/stringfwd.h \
-       ${bits_srcdir}/type_traits.h \
-       ${bits_srcdir}/valarray_array.h \
-       ${bits_srcdir}/valarray_array.tcc \
-       ${bits_srcdir}/valarray_meta.h
+bits_headers =         ${bits_srcdir}/basic_file.h     ${bits_srcdir}/basic_ios.h      ${bits_srcdir}/basic_ios.tcc    ${bits_srcdir}/basic_string.h   ${bits_srcdir}/basic_string.tcc         ${bits_srcdir}/boost_concept_check.h    ${bits_srcdir}/char_traits.h    ${bits_srcdir}/codecvt.h        ${bits_srcdir}/concept_check.h  ${bits_srcdir}/cpp_type_traits.h        ${bits_srcdir}/fpos.h   ${bits_srcdir}/fstream.tcc      ${bits_srcdir}/functexcept.h    ${bits_srcdir}/generic_shadow.h         ${bits_srcdir}/gslice.h         ${bits_srcdir}/gslice_array.h   ${bits_srcdir}/indirect_array.h         ${bits_srcdir}/ios_base.h       ${bits_srcdir}/istream.tcc      ${bits_srcdir}/locale_facets.h  ${bits_srcdir}/locale_facets.tcc        ${bits_srcdir}/localefwd.h      ${bits_srcdir}/mask_array.h     ${bits_srcdir}/ostream.tcc      ${bits_srcdir}/pthread_allocimpl.h      ${bits_srcdir}/stream_iterator.h        ${bits_srcdir}/streambuf_iterator.h     ${bits_srcdir}/slice.h  ${bits_srcdir}/slice_array.h    ${bits_srcdir}/sstream.tcc      ${bits_srcdir}/stl_algo.h       ${bits_srcdir}/stl_algobase.h   ${bits_srcdir}/stl_alloc.h      ${bits_srcdir}/stl_bvector.h    ${bits_srcdir}/stl_construct.h  ${bits_srcdir}/stl_deque.h      ${bits_srcdir}/stl_function.h   ${bits_srcdir}/stl_heap.h       ${bits_srcdir}/stl_iterator.h   ${bits_srcdir}/stl_iterator_base_funcs.h        ${bits_srcdir}/stl_iterator_base_types.h        ${bits_srcdir}/stl_list.h       ${bits_srcdir}/stl_map.h        ${bits_srcdir}/stl_multimap.h   ${bits_srcdir}/stl_multiset.h   ${bits_srcdir}/stl_numeric.h    ${bits_srcdir}/stl_pair.h       ${bits_srcdir}/stl_pthread_alloc.h      ${bits_srcdir}/stl_queue.h      ${bits_srcdir}/stl_raw_storage_iter.h   ${bits_srcdir}/stl_relops.h     ${bits_srcdir}/stl_set.h        ${bits_srcdir}/stl_stack.h      ${bits_srcdir}/stl_tempbuf.h    ${bits_srcdir}/stl_threads.h    ${bits_srcdir}/stl_tree.h       ${bits_srcdir}/stl_uninitialized.h      ${bits_srcdir}/stl_vector.h     ${bits_srcdir}/streambuf.tcc    ${bits_srcdir}/stringfwd.h      ${bits_srcdir}/type_traits.h    ${bits_srcdir}/valarray_array.h         ${bits_srcdir}/valarray_array.tcc       ${bits_srcdir}/valarray_meta.h
 
 
 backward_srcdir = ${glibcpp_srcdir}/include/backward
 backward_builddir = ./backward
-backward_headers = \
-       ${backward_srcdir}/complex.h \
-       ${backward_srcdir}/iomanip.h \
-       ${backward_srcdir}/istream.h \
-       ${backward_srcdir}/ostream.h \
-       ${backward_srcdir}/stream.h \
-       ${backward_srcdir}/streambuf.h \
-       ${backward_srcdir}/algo.h \
-       ${backward_srcdir}/algobase.h \
-       ${backward_srcdir}/alloc.h \
-       ${backward_srcdir}/bvector.h \
-       ${backward_srcdir}/defalloc.h \
-       ${backward_srcdir}/deque.h \
-       ${backward_srcdir}/function.h \
-       ${backward_srcdir}/hash_map.h \
-       ${backward_srcdir}/hash_set.h \
-       ${backward_srcdir}/hashtable.h \
-       ${backward_srcdir}/heap.h \
-       ${backward_srcdir}/iostream.h \
-       ${backward_srcdir}/iterator.h \
-       ${backward_srcdir}/list.h \
-       ${backward_srcdir}/map.h \
-       ${backward_srcdir}/multimap.h \
-       ${backward_srcdir}/new.h \
-       ${backward_srcdir}/multiset.h \
-       ${backward_srcdir}/pair.h \
-       ${backward_srcdir}/queue.h \
-       ${backward_srcdir}/rope.h \
-       ${backward_srcdir}/set.h \
-       ${backward_srcdir}/slist.h \
-       ${backward_srcdir}/stack.h \
-       ${backward_srcdir}/tempbuf.h \
-       ${backward_srcdir}/tree.h \
-       ${backward_srcdir}/vector.h \
-       ${backward_srcdir}/fstream.h \
-       ${backward_srcdir}/strstream.h \
-       ${backward_srcdir}/strstream \
-       ${backward_srcdir}/backward_warning.h
+backward_headers =     ${backward_srcdir}/complex.h    ${backward_srcdir}/iomanip.h    ${backward_srcdir}/istream.h    ${backward_srcdir}/ostream.h    ${backward_srcdir}/stream.h     ${backward_srcdir}/streambuf.h  ${backward_srcdir}/algo.h       ${backward_srcdir}/algobase.h   ${backward_srcdir}/alloc.h      ${backward_srcdir}/bvector.h    ${backward_srcdir}/defalloc.h   ${backward_srcdir}/deque.h      ${backward_srcdir}/function.h   ${backward_srcdir}/hash_map.h   ${backward_srcdir}/hash_set.h   ${backward_srcdir}/hashtable.h  ${backward_srcdir}/heap.h       ${backward_srcdir}/iostream.h   ${backward_srcdir}/iterator.h   ${backward_srcdir}/list.h       ${backward_srcdir}/map.h        ${backward_srcdir}/multimap.h   ${backward_srcdir}/new.h        ${backward_srcdir}/multiset.h   ${backward_srcdir}/pair.h       ${backward_srcdir}/queue.h      ${backward_srcdir}/rope.h       ${backward_srcdir}/set.h        ${backward_srcdir}/slist.h      ${backward_srcdir}/stack.h      ${backward_srcdir}/tempbuf.h    ${backward_srcdir}/tree.h       ${backward_srcdir}/vector.h     ${backward_srcdir}/fstream.h    ${backward_srcdir}/strstream.h  ${backward_srcdir}/strstream    ${backward_srcdir}/backward_warning.h
 
 
 ext_srcdir = ${glibcpp_srcdir}/include/ext
 ext_builddir = ./ext
-ext_headers = \
-       ${ext_srcdir}/algorithm \
-       ${ext_srcdir}/functional \
-       ${ext_srcdir}/hash_map \
-       ${ext_srcdir}/hash_set \
-       ${ext_srcdir}/iterator \
-       ${ext_srcdir}/memory \
-       ${ext_srcdir}/numeric \
-       ${ext_srcdir}/rb_tree \
-       ${ext_srcdir}/rope \
-       ${ext_srcdir}/ropeimpl.h \
-       ${ext_srcdir}/slist \
-       ${ext_srcdir}/stl_hash_fun.h \
-       ${ext_srcdir}/stl_hashtable.h \
-       ${ext_srcdir}/stl_rope.h
+ext_headers =          ${ext_srcdir}/algorithm         ${ext_srcdir}/functional        ${ext_srcdir}/hash_map  ${ext_srcdir}/hash_set  ${ext_srcdir}/iterator  ${ext_srcdir}/memory    ${ext_srcdir}/numeric   ${ext_srcdir}/rb_tree   ${ext_srcdir}/rope      ${ext_srcdir}/ropeimpl.h        ${ext_srcdir}/slist     ${ext_srcdir}/stl_hash_fun.h    ${ext_srcdir}/stl_hashtable.h   ${ext_srcdir}/stl_rope.h
 
 
 # This is the common subset of files that all three "C" header models use.
 c_base_srcdir = @C_INCLUDE_DIR@
 c_base_builddir = ./
-c_base_headers = \
-       ${c_base_srcdir}/cassert \
-       ${c_base_srcdir}/cctype \
-       ${c_base_srcdir}/cerrno \
-       ${c_base_srcdir}/cfloat \
-       ${c_base_srcdir}/ciso646 \
-       ${c_base_srcdir}/climits \
-       ${c_base_srcdir}/clocale \
-       ${c_base_srcdir}/cmath \
-       ${c_base_srcdir}/csetjmp \
-       ${c_base_srcdir}/csignal \
-       ${c_base_srcdir}/cstdarg \
-       ${c_base_srcdir}/cstddef \
-       ${c_base_srcdir}/cstdio \
-       ${c_base_srcdir}/cstdlib \
-       ${c_base_srcdir}/cstring \
-       ${c_base_srcdir}/ctime \
-       ${c_base_srcdir}/cwchar \
-       ${c_base_srcdir}/cwctype \
-       ${c_base_srcdir}/cmath.tcc 
+c_base_headers =       ${c_base_srcdir}/cassert        ${c_base_srcdir}/cctype         ${c_base_srcdir}/cerrno         ${c_base_srcdir}/cfloat         ${c_base_srcdir}/ciso646        ${c_base_srcdir}/climits        ${c_base_srcdir}/clocale        ${c_base_srcdir}/cmath  ${c_base_srcdir}/csetjmp        ${c_base_srcdir}/csignal        ${c_base_srcdir}/cstdarg        ${c_base_srcdir}/cstddef        ${c_base_srcdir}/cstdio         ${c_base_srcdir}/cstdlib        ${c_base_srcdir}/cstring        ${c_base_srcdir}/ctime  ${c_base_srcdir}/cwchar         ${c_base_srcdir}/cwctype        ${c_base_srcdir}/cmath.tcc 
 
 
 std_srcdir = ${glibcpp_srcdir}/include/std
 std_builddir = ./
-std_headers = \
-       ${std_srcdir}/algorithm \
-       ${std_srcdir}/bitset \
-       ${std_srcdir}/complex \
-       ${std_srcdir}/deque \
-       ${std_srcdir}/fstream \
-       ${std_srcdir}/functional \
-       ${std_srcdir}/iomanip \
-       ${std_srcdir}/ios \
-       ${std_srcdir}/iosfwd \
-       ${std_srcdir}/iostream \
-       ${std_srcdir}/istream \
-       ${std_srcdir}/iterator \
-       ${std_srcdir}/limits \
-       ${std_srcdir}/list \
-       ${std_srcdir}/locale \
-       ${std_srcdir}/map \
-       ${std_srcdir}/memory \
-       ${std_srcdir}/numeric \
-       ${std_srcdir}/ostream \
-       ${std_srcdir}/queue \
-       ${std_srcdir}/set \
-       ${std_srcdir}/sstream \
-       ${std_srcdir}/stack \
-       ${std_srcdir}/stdexcept \
-       ${std_srcdir}/streambuf \
-       ${std_srcdir}/string \
-       ${std_srcdir}/utility \
-       ${std_srcdir}/valarray \
-       ${std_srcdir}/vector 
+std_headers =          ${std_srcdir}/algorithm         ${std_srcdir}/bitset    ${std_srcdir}/complex   ${std_srcdir}/deque     ${std_srcdir}/fstream   ${std_srcdir}/functional        ${std_srcdir}/iomanip   ${std_srcdir}/ios       ${std_srcdir}/iosfwd    ${std_srcdir}/iostream  ${std_srcdir}/istream   ${std_srcdir}/iterator  ${std_srcdir}/limits    ${std_srcdir}/list      ${std_srcdir}/locale    ${std_srcdir}/map       ${std_srcdir}/memory    ${std_srcdir}/numeric   ${std_srcdir}/ostream   ${std_srcdir}/queue     ${std_srcdir}/set       ${std_srcdir}/sstream   ${std_srcdir}/stack     ${std_srcdir}/stdexcept         ${std_srcdir}/streambuf         ${std_srcdir}/string    ${std_srcdir}/utility   ${std_srcdir}/valarray  ${std_srcdir}/vector 
 
 
 target_srcdir = ${glibcpp_srcdir}/@OS_INC_SRCDIR@
 target_builddir = ./${target_alias}/bits
-target_headers = \
-       ${target_srcdir}/ctype_base.h \
-       ${target_srcdir}/ctype_inline.h \
-       ${target_srcdir}/ctype_noninline.h \
-       ${target_srcdir}/os_defines.h \
-       ${glibcpp_srcdir}/@ATOMICITY_INC_SRCDIR@/atomicity.h \
-       ${glibcpp_srcdir}/@CPU_LIMITS_INC_SRCDIR@/cpu_limits.h 
+target_headers =       ${target_srcdir}/ctype_base.h   ${target_srcdir}/ctype_inline.h         ${target_srcdir}/ctype_noninline.h      ${target_srcdir}/os_defines.h   ${glibcpp_srcdir}/@ATOMICITY_INC_SRCDIR@/atomicity.h    ${glibcpp_srcdir}/@CPU_LIMITS_INC_SRCDIR@/cpu_limits.h 
+
+# These extra_target_headers files are all built with ad hoc naming rules.
+extra_target_headers =         ${target_builddir}/basic_file_model.h   ${target_builddir}/c++config.h  ${target_builddir}/c++io.h      ${target_builddir}/c++locale.h  ${target_builddir}/messages_members.h   ${target_builddir}/codecvt_specializations.h
 
 
 thread_builddir = ./${target_alias}/bits
-thread_headers = \
-       ${thread_builddir}/gthr.h \
-       ${thread_builddir}/gthr-single.h \
-       ${thread_builddir}/gthr-default.h
+thread_headers =       ${thread_builddir}/gthr.h       ${thread_builddir}/gthr-single.h        ${thread_builddir}/gthr-default.h
 
 
 # List of all timestamp files.  By keeping only one copy of this list, both
 # CLEANFILES and all-local are kept up-to-date.
-allstamps = stamp-std stamp-bits stamp-c_base stamp-backward stamp-ext \
-       stamp-target stamp-thread 
+allstamps = stamp-std stamp-bits stamp-c_base stamp-backward stamp-ext         stamp-target stamp-thread 
 
 
 # Target includes for threads
 glibcpp_thread_h = @glibcpp_thread_h@
 uppercase = [ABCDEFGHIJKLMNOPQRSTUVWXYZ_]
 
-# One big happy istallation:  just copy everything from the build to the
-# install tree (except for the build stamps).
+# For robustness sake (in light of junk files or in-source
+# configuration), copy from the build or source tree to the install
+# tree using only the human-maintained file lists and directory
+# components.  Yes, with minor differences, this is sheer duplication
+# of the staging rules above using $(INSTALL_DATA) instead of LN_S and
+# `$(INSTALL) -d' instead of `mkdir -p'.  In particular,
+# extra_target_headers are taken out of the build tree staging area;
+# the rest are taken from the original source tree.
 gxx_include_dir = @gxx_include_dir@
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
@@ -383,7 +219,7 @@ DIST_COMMON =  Makefile.am Makefile.in
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = gtar
+TAR = tar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
@@ -485,35 +321,35 @@ stamp-std: ${std_headers}
        @if [ ! -d "${std_builddir}" ]; then \
          mkdir -p ${std_builddir} ;\
        fi ;\
-       (cd ${std_builddir} && @LN_S@ $? .) ;\
+       (cd ${std_builddir} && @LN_S@ $? . || true) ;\
        echo `date` > stamp-std 
 
 stamp-bits: ${bits_headers}
        @if [ ! -d "${bits_builddir}" ]; then \
          mkdir -p ${bits_builddir} ;\
        fi ;\
-       (cd ${bits_builddir} && @LN_S@ $? .) ;\
+       (cd ${bits_builddir} && @LN_S@ $? . || true) ;\
        echo `date` > stamp-bits
 
 stamp-c_base: ${c_base_headers}
        @if [ ! -d "${c_base_builddir}" ]; then \
          mkdir -p ${c_base_builddir} ;\
        fi ;\
-       (cd ${c_base_builddir} && @LN_S@ $? .) ;\
+       (cd ${c_base_builddir} && @LN_S@ $? . || true) ;\
        echo `date` > stamp-c_base
 
 stamp-backward: ${backward_headers}
        @if [ ! -d "${backward_builddir}" ]; then \
          mkdir -p ${backward_builddir} ;\
        fi ;\
-       (cd ${backward_builddir} && @LN_S@ $? .) ;\
+       (cd ${backward_builddir} && @LN_S@ $? . || true) ;\
        echo `date` > stamp-backward
 
 stamp-ext: ${ext_headers}
        @if [ ! -d "${ext_builddir}" ]; then \
          mkdir -p ${ext_builddir} ;\
        fi ;\
-       (cd ${ext_builddir} && @LN_S@ $? .) ;\
+       (cd ${ext_builddir} && @LN_S@ $? . || true) ;\
        echo `date` > stamp-ext
 
 # This target is special.  The timestamp on a directory gets modified
@@ -531,12 +367,12 @@ stamp-${target_alias}:
 stamp-target: ${target_headers} ${target_builddir}
        @cd ${target_builddir} ;\
        if [ ! -f stamp-target ]; then \
-         @LN_S@ ${target_headers} . ;\
-         @LN_S@ ${glibcpp_srcdir}/@BASIC_FILE_H@ basic_file_model.h ;\
-         @LN_S@ ${glibcpp_srcdir}/@CSTDIO_H@ c++io.h ;\
-         @LN_S@ ${glibcpp_srcdir}/@CLOCALE_H@ c++locale.h ;\
-         @LN_S@ ${glibcpp_srcdir}/@CMESSAGES_H@ messages_members.h ;\
-         @LN_S@ ${glibcpp_srcdir}/@CCODECVT_H@ codecvt_specializations.h ;\
+         @LN_S@ ${target_headers} . || true ;\
+         @LN_S@ ${glibcpp_srcdir}/@BASIC_FILE_H@ basic_file_model.h || true ;\
+         @LN_S@ ${glibcpp_srcdir}/@CSTDIO_H@ c++io.h || true ;\
+         @LN_S@ ${glibcpp_srcdir}/@CLOCALE_H@ c++locale.h || true ;\
+         @LN_S@ ${glibcpp_srcdir}/@CMESSAGES_H@ messages_members.h || true ;\
+         @LN_S@ ${glibcpp_srcdir}/@CCODECVT_H@ codecvt_specializations.h || true ;\
          echo `date` > stamp-target; \
        fi
 
@@ -571,14 +407,28 @@ ${thread_builddir}/gthr-default.h:
            -e 's/\(${uppercase}*WEAK\)/_GLIBCPP_\1/g' \
            < ${toplevel_srcdir}/gcc/${glibcpp_thread_h} > $@
 install-data-local:
-       for file in `find . ! -name stamp-\* ! -name Makefile -print`; do \
-       installFile=${gxx_include_dir}/$${file} ;\
-       if [ -d $${file} ]; then \
-         $(INSTALL) -d $${installFile} ;\
-       else \
-         $(INSTALL_DATA) $${file} $${installFile} ;\
-       fi ;\
-       done
+       $(INSTALL) -d ${gxx_include_dir}
+       $(INSTALL) -d ${gxx_include_dir}/${bits_builddir}
+       for file in ${bits_headers}; do \
+         $(INSTALL_DATA) $${file} ${gxx_include_dir}/${bits_builddir}; done
+       $(INSTALL) -d ${gxx_include_dir}/${backward_builddir}
+       for file in ${backward_headers}; do \
+         $(INSTALL_DATA) $${file} ${gxx_include_dir}/${backward_builddir}; done
+       $(INSTALL) -d ${gxx_include_dir}/${ext_builddir}
+       for file in ${ext_headers}; do \
+         $(INSTALL_DATA) $${file} ${gxx_include_dir}/${ext_builddir}; done
+       $(INSTALL) -d ${gxx_include_dir}/${c_base_builddir}
+       for file in ${c_base_headers}; do \
+         $(INSTALL_DATA) $${file} ${gxx_include_dir}/${c_base_builddir}; done
+       $(INSTALL) -d ${gxx_include_dir}/${std_builddir}
+       for file in ${std_headers}; do \
+         $(INSTALL_DATA) $${file} ${gxx_include_dir}/${std_builddir}; done
+       $(INSTALL) -d ${gxx_include_dir}/${target_builddir}
+       for file in ${target_headers} ${extra_target_headers}; do \
+         $(INSTALL_DATA) $${file} ${gxx_include_dir}/${target_builddir}; done
+       $(INSTALL) -d ${gxx_include_dir}/${thread_builddir}
+       for file in ${thread_headers}; do \
+         $(INSTALL_DATA) $${file} ${gxx_include_dir}/${thread_builddir}; done
 
 # By adding these files here, automake will remove them for 'make clean'
 #CLEANFILES = ${allstamps}