This is the mail archive of the libstdc++@gcc.gnu.org mailing list for the libstdc++ project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

PATCH: libstdc++-v3/include/Makefile.am tweak


Applied as obvious.  ``make check-script-install'' with no regressions
on i386-unknown-freebsd4.4 (affects C++ header installation only, thus
cleaned out that part of the install tree before reinstall/test).

Also, manually studied the install log before and after patch...

	* 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.

Index: libstdc++-v3/include/Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/Makefile.am,v
retrieving revision 1.26
diff -c -r1.26 Makefile.am
*** Makefile.am	2002/01/17 07:18:33	1.26
--- Makefile.am	2002/01/22 16:39:12
***************
*** 160,166 ****
  
  # 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 \
--- 160,166 ----
  
  # 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 \
***************
*** 204,210 ****
  	cwctype 
  
  std_srcdir = ${glibcpp_srcdir}/include/std
! std_builddir = ./
  std_headers = \
  	${std_srcdir}/std_algorithm.h \
  	${std_srcdir}/std_bitset.h \
--- 204,210 ----
  	cwctype 
  
  std_srcdir = ${glibcpp_srcdir}/include/std
! std_builddir = .
  std_headers = \
  	${std_srcdir}/std_algorithm.h \
  	${std_srcdir}/std_bitset.h \
***************
*** 256,262 ****
  	memory \
  	numeric \
  	ostream \
! 	${std_builddir}/queue \
  	set \
  	sstream \
  	stack \
--- 256,262 ----
  	memory \
  	numeric \
  	ostream \
! 	queue \
  	set \
  	sstream \
  	stack \
***************
*** 425,437 ****
  	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_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
  	$(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
--- 425,439 ----
  	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_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_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


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]