* include/Makefile.am (c_base_builddir): Remove redundant slash.

	(std_builddir): Likewise.
	(std_headers_rename): Fix cut-n-paste typo.
	(install-data-local): Concat path per element instead of once to
	first element of list.
	* include/Makefile.in: Rebuilt.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@49081 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 345b36f..b1b5e8e 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,12 @@
+2002-01-22  Loren Rittle <ljrittle@acm.org>
+
+       * include/Makefile.am (c_base_builddir): Remove redundant slash.
+       (std_builddir): Likewise.
+       (std_headers_rename): Fix cut-n-paste typo.
+       (install-data-local): Concat path per element instead of once to
+       first element of list.
+       * include/Makefile.in: Rebuilt.
+
 2002-01-22  Benjamin Kosnik  <bkoz@redhat.com>
 
        * config/os/aix/bits/ctype_noninline.h: Fix formatting.

diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am
index aa06323..f3fef8d 100644 (file)
--- a/libstdc++-v3/include/Makefile.am
+++ b/libstdc++-v3/include/Makefile.am
@@ -160,7 +160,7 @@ ext_headers = \
 
 # 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_builddir = .
 c_base_headers = \
        ${c_base_srcdir}/std_cassert.h \
        ${c_base_srcdir}/std_cctype.h \
@@ -204,7 +204,7 @@ c_base_headers_rename = \
        cwctype 
 
 std_srcdir = ${glibcpp_srcdir}/include/std
-std_builddir = ./
+std_builddir = .
 std_headers = \
        ${std_srcdir}/std_algorithm.h \
        ${std_srcdir}/std_bitset.h \
@@ -256,7 +256,7 @@ std_headers_rename = \
        memory \
        numeric \
        ostream \
-       ${std_builddir}/queue \
+       queue \
        set \
        sstream \
        stack \
@@ -425,13 +425,15 @@ install-data-local:
        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_builddir}/${c_base_headers_rename}; do \
-         $(INSTALL_DATA) $${file} ${gxx_include_dir}/${c_base_builddir}; done
+       for file in ${c_base_headers_rename}; do \
+         $(INSTALL_DATA) ${c_base_builddir}/$${file} \
+           ${gxx_include_dir}/${c_base_builddir}; done
        for file in ${c_base_headers_extra}; do \
          $(INSTALL_DATA) $${file} ${gxx_include_dir}/${c_base_builddir}; done
        $(INSTALL) -d ${gxx_include_dir}/${std_builddir}
-       for file in ${std_builddir}/${std_headers_rename}; do \
-         $(INSTALL_DATA) $${file} ${gxx_include_dir}/${std_builddir}; done
+       for file in ${std_headers_rename}; do \
+         $(INSTALL_DATA) ${std_builddir}/$${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

diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in
index 633e832..c01bc81 100644 (file)
--- a/libstdc++-v3/include/Makefile.in
+++ b/libstdc++-v3/include/Makefile.in
@@ -158,279 +158,53 @@ 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}/std_cassert.h \
-       ${c_base_srcdir}/std_cctype.h \
-       ${c_base_srcdir}/std_cerrno.h \
-       ${c_base_srcdir}/std_cfloat.h \
-       ${c_base_srcdir}/std_ciso646.h \
-       ${c_base_srcdir}/std_climits.h \
-       ${c_base_srcdir}/std_clocale.h \
-       ${c_base_srcdir}/std_cmath.h \
-       ${c_base_srcdir}/std_csetjmp.h \
-       ${c_base_srcdir}/std_csignal.h \
-       ${c_base_srcdir}/std_cstdarg.h \
-       ${c_base_srcdir}/std_cstddef.h \
-       ${c_base_srcdir}/std_cstdio.h \
-       ${c_base_srcdir}/std_cstdlib.h \
-       ${c_base_srcdir}/std_cstring.h \
-       ${c_base_srcdir}/std_ctime.h \
-       ${c_base_srcdir}/std_cwchar.h \
-       ${c_base_srcdir}/std_cwctype.h 
+c_base_builddir = .
+c_base_headers =       ${c_base_srcdir}/std_cassert.h  ${c_base_srcdir}/std_cctype.h   ${c_base_srcdir}/std_cerrno.h   ${c_base_srcdir}/std_cfloat.h   ${c_base_srcdir}/std_ciso646.h  ${c_base_srcdir}/std_climits.h  ${c_base_srcdir}/std_clocale.h  ${c_base_srcdir}/std_cmath.h    ${c_base_srcdir}/std_csetjmp.h  ${c_base_srcdir}/std_csignal.h  ${c_base_srcdir}/std_cstdarg.h  ${c_base_srcdir}/std_cstddef.h  ${c_base_srcdir}/std_cstdio.h   ${c_base_srcdir}/std_cstdlib.h  ${c_base_srcdir}/std_cstring.h  ${c_base_srcdir}/std_ctime.h    ${c_base_srcdir}/std_cwchar.h   ${c_base_srcdir}/std_cwctype.h 
 
 # Some of the "C" headers need extra files.
-c_base_headers_extra = \
-       ${c_base_srcdir}/cmath.tcc 
-
-c_base_headers_rename = \
-       cassert \
-       cctype \
-       cerrno \
-       cfloat \
-       ciso646 \
-       climits \
-       clocale \
-       cmath \
-       csetjmp \
-       csignal \
-       cstdarg \
-       cstddef \
-       cstdio \
-       cstdlib \
-       cstring \
-       ctime \
-       cwchar \
-       cwctype 
+c_base_headers_extra =         ${c_base_srcdir}/cmath.tcc 
+
+c_base_headers_rename =        cassert         cctype  cerrno  cfloat  ciso646         climits         clocale         cmath   csetjmp         csignal         cstdarg         cstddef         cstdio  cstdlib         cstring         ctime   cwchar  cwctype 
 
 
 std_srcdir = ${glibcpp_srcdir}/include/std
-std_builddir = ./
-std_headers = \
-       ${std_srcdir}/std_algorithm.h \
-       ${std_srcdir}/std_bitset.h \
-       ${std_srcdir}/std_complex.h \
-       ${std_srcdir}/std_deque.h \
-       ${std_srcdir}/std_fstream.h \
-       ${std_srcdir}/std_functional.h \
-       ${std_srcdir}/std_iomanip.h \
-       ${std_srcdir}/std_ios.h \
-       ${std_srcdir}/std_iosfwd.h \
-       ${std_srcdir}/std_iostream.h \
-       ${std_srcdir}/std_istream.h \
-       ${std_srcdir}/std_iterator.h \
-       ${std_srcdir}/std_limits.h \
-       ${std_srcdir}/std_list.h \
-       ${std_srcdir}/std_locale.h \
-       ${std_srcdir}/std_map.h \
-       ${std_srcdir}/std_memory.h \
-       ${std_srcdir}/std_numeric.h \
-       ${std_srcdir}/std_ostream.h \
-       ${std_srcdir}/std_queue.h \
-       ${std_srcdir}/std_set.h \
-       ${std_srcdir}/std_sstream.h \
-       ${std_srcdir}/std_stack.h \
-       ${std_srcdir}/std_stdexcept.h \
-       ${std_srcdir}/std_streambuf.h \
-       ${std_srcdir}/std_string.h \
-       ${std_srcdir}/std_utility.h \
-       ${std_srcdir}/std_valarray.h \
-       ${std_srcdir}/std_vector.h
+std_builddir = .
+std_headers =          ${std_srcdir}/std_algorithm.h   ${std_srcdir}/std_bitset.h      ${std_srcdir}/std_complex.h     ${std_srcdir}/std_deque.h       ${std_srcdir}/std_fstream.h     ${std_srcdir}/std_functional.h  ${std_srcdir}/std_iomanip.h     ${std_srcdir}/std_ios.h         ${std_srcdir}/std_iosfwd.h      ${std_srcdir}/std_iostream.h    ${std_srcdir}/std_istream.h     ${std_srcdir}/std_iterator.h    ${std_srcdir}/std_limits.h      ${std_srcdir}/std_list.h        ${std_srcdir}/std_locale.h      ${std_srcdir}/std_map.h         ${std_srcdir}/std_memory.h      ${std_srcdir}/std_numeric.h     ${std_srcdir}/std_ostream.h     ${std_srcdir}/std_queue.h       ${std_srcdir}/std_set.h         ${std_srcdir}/std_sstream.h     ${std_srcdir}/std_stack.h       ${std_srcdir}/std_stdexcept.h   ${std_srcdir}/std_streambuf.h   ${std_srcdir}/std_string.h      ${std_srcdir}/std_utility.h     ${std_srcdir}/std_valarray.h    ${std_srcdir}/std_vector.h
 
 # Renamed at build time. 
-std_headers_rename = \
-       algorithm \
-       bitset \
-       complex \
-       deque \
-       fstream \
-       functional \
-       iomanip \
-       ios \
-       iosfwd \
-       iostream \
-       istream \
-       iterator \
-       limits \
-       list \
-       locale \
-       map \
-       memory \
-       numeric \
-       ostream \
-       ${std_builddir}/queue \
-       set \
-       sstream \
-       stack \
-       stdexcept \
-       streambuf \
-       string \
-       utility \
-       valarray \
-       vector
+std_headers_rename =   algorithm       bitset  complex         deque   fstream         functional      iomanip         ios     iosfwd  iostream        istream         iterator        limits  list    locale  map     memory  numeric         ostream         queue   set     sstream         stack   stdexcept       streambuf       string  utility         valarray        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
+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
@@ -453,7 +227,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:
@@ -661,13 +435,15 @@ install-data-local:
        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_builddir}/${c_base_headers_rename}; do \
-         $(INSTALL_DATA) $${file} ${gxx_include_dir}/${c_base_builddir}; done
+       for file in ${c_base_headers_rename}; do \
+         $(INSTALL_DATA) ${c_base_builddir}/$${file} \
+           ${gxx_include_dir}/${c_base_builddir}; done
        for file in ${c_base_headers_extra}; do \
          $(INSTALL_DATA) $${file} ${gxx_include_dir}/${c_base_builddir}; done
        $(INSTALL) -d ${gxx_include_dir}/${std_builddir}
-       for file in ${std_builddir}/${std_headers_rename}; do \
-         $(INSTALL_DATA) $${file} ${gxx_include_dir}/${std_builddir}; done
+       for file in ${std_headers_rename}; do \
+         $(INSTALL_DATA) ${std_builddir}/$${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