Makefile.am (install-data-local): Prepend $(DESTDIR) to destination paths in all...

* include/Makefile.am (install-data-local): Prepend
$(DESTDIR) to destination paths in all (un)installation
commands.  Use ${c_base_builddir} and ${std_builddir}
as destination subdirectories to achieve consistency with
preceding mkinstalldirs commands.  No effect because both
variables contain "." only.
* include/Makefile.in: Regenerate.

From-SVN: r62010

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 025af34b0477ed5fbb9d628116445d10b0927640..a1d47cb34700d599cbeca818866d5d8eb6ee49d1 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,13 @@
+2003-01-28  Christian Cornelssen  <ccorn@cs.tu-berlin.de>
+
+       * include/Makefile.am (install-data-local): Prepend
+       $(DESTDIR) to destination paths in all (un)installation
+       commands.  Use ${c_base_builddir} and ${std_builddir}
+       as destination subdirectories to achieve consistency with
+       preceding mkinstalldirs commands.  No effect because both
+       variables contain "." only.
+       * include/Makefile.in: Regenerate.
+
 2003-01-28  Nathan Sidwell  <nathan@codesourcery.com>
 
        PR c++/9433

diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am
index d9f0fa5d94574b8991fdb8cb66979b1bf665ba9e..5c87bb3b45b14f8a4a92ae9ff500a8a8bb78597c 100644 (file)
--- a/libstdc++-v3/include/Makefile.am
+++ b/libstdc++-v3/include/Makefile.am
@@ -467,32 +467,32 @@ ${target_builddir}/gthr-default.h: ${toplevel_srcdir}/gcc/${glibcpp_thread_h} \
 # the rest are taken from the original source tree.
 gxx_include_dir = @gxx_include_dir@
 install-data-local:
-       $(mkinstalldirs) ${gxx_include_dir}
-       $(mkinstalldirs) ${gxx_include_dir}/${bits_builddir}
+       $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}
+       $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${bits_builddir}
        for file in ${bits_headers}; do \
-         $(INSTALL_DATA) $${file} ${gxx_include_dir}/${bits_builddir}; done
-       $(mkinstalldirs) ${gxx_include_dir}/${backward_builddir}
+         $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${bits_builddir}; done
+       $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${backward_builddir}
        for file in ${backward_headers}; do \
-         $(INSTALL_DATA) $${file} ${gxx_include_dir}/${backward_builddir}; done
-       $(mkinstalldirs) ${gxx_include_dir}/${ext_builddir}
+         $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${backward_builddir}; done
+       $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${ext_builddir}
        for file in ${ext_headers}; do \
-         $(INSTALL_DATA) $${file} ${gxx_include_dir}/${ext_builddir}; done
-       $(mkinstalldirs) ${gxx_include_dir}/${c_base_builddir}
+         $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${ext_builddir}; done
+       $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${c_base_builddir}
        for file in ${c_base_headers_rename}; do \
-         $(INSTALL_DATA) ${c_base_builddir}/$${file} ${gxx_include_dir}; done
+         $(INSTALL_DATA) ${c_base_builddir}/$${file} $(DESTDIR)${gxx_include_dir}/${c_base_builddir}; done
        c_base_headers_extra_install='$(c_base_headers_extra)';\
        for file in $$c_base_headers_extra_install; do \
-         $(INSTALL_DATA) $$file ${gxx_include_dir}/${bits_builddir}; done
+         $(INSTALL_DATA) $$file $(DESTDIR)${gxx_include_dir}/${bits_builddir}; done
        c_compatibility_headers_install='$(c_compatibility_headers_extra)';\
        for file in $$c_compatibility_headers_install; do \
-         $(INSTALL_DATA) $$file ${gxx_include_dir}; done
-       $(mkinstalldirs) ${gxx_include_dir}/${std_builddir}
+         $(INSTALL_DATA) $$file $(DESTDIR)${gxx_include_dir}; done
+       $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${std_builddir}
        for file in ${std_headers_rename}; do \
-         $(INSTALL_DATA) ${std_builddir}/$${file} ${gxx_include_dir}; done
-       $(mkinstalldirs) ${gxx_include_dir}/${target_builddir}
+         $(INSTALL_DATA) ${std_builddir}/$${file} $(DESTDIR)${gxx_include_dir}/${std_builddir}; done
+       $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${target_builddir}
        for file in ${target_headers} ${target_headers_extra} \
         ${thread_target_headers}; do \
-         $(INSTALL_DATA) $${file} ${gxx_include_dir}/${target_builddir}; done
+         $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${target_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 edb328383314039f013cbe6bcf38772c0789a7d8..37a06d4199e7e07ec58211f6e4860e6f47eeae0d 100644 (file)
--- a/libstdc++-v3/include/Makefile.in
+++ b/libstdc++-v3/include/Makefile.in
@@ -675,32 +675,32 @@ ${target_builddir}/gthr-default.h: ${toplevel_srcdir}/gcc/${glibcpp_thread_h} \
            -e 's,^#include "\(.*\)",#include <bits/\1>,g' \
            < ${toplevel_srcdir}/gcc/${glibcpp_thread_h} > $@
 install-data-local:
-       $(mkinstalldirs) ${gxx_include_dir}
-       $(mkinstalldirs) ${gxx_include_dir}/${bits_builddir}
+       $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}
+       $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${bits_builddir}
        for file in ${bits_headers}; do \
-         $(INSTALL_DATA) $${file} ${gxx_include_dir}/${bits_builddir}; done
-       $(mkinstalldirs) ${gxx_include_dir}/${backward_builddir}
+         $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${bits_builddir}; done
+       $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${backward_builddir}
        for file in ${backward_headers}; do \
-         $(INSTALL_DATA) $${file} ${gxx_include_dir}/${backward_builddir}; done
-       $(mkinstalldirs) ${gxx_include_dir}/${ext_builddir}
+         $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${backward_builddir}; done
+       $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${ext_builddir}
        for file in ${ext_headers}; do \
-         $(INSTALL_DATA) $${file} ${gxx_include_dir}/${ext_builddir}; done
-       $(mkinstalldirs) ${gxx_include_dir}/${c_base_builddir}
+         $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${ext_builddir}; done
+       $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${c_base_builddir}
        for file in ${c_base_headers_rename}; do \
-         $(INSTALL_DATA) ${c_base_builddir}/$${file} ${gxx_include_dir}; done
+         $(INSTALL_DATA) ${c_base_builddir}/$${file} $(DESTDIR)${gxx_include_dir}/${c_base_builddir}; done
        c_base_headers_extra_install='$(c_base_headers_extra)';\
        for file in $$c_base_headers_extra_install; do \
-         $(INSTALL_DATA) $$file ${gxx_include_dir}/${bits_builddir}; done
+         $(INSTALL_DATA) $$file $(DESTDIR)${gxx_include_dir}/${bits_builddir}; done
        c_compatibility_headers_install='$(c_compatibility_headers_extra)';\
        for file in $$c_compatibility_headers_install; do \
-         $(INSTALL_DATA) $$file ${gxx_include_dir}; done
-       $(mkinstalldirs) ${gxx_include_dir}/${std_builddir}
+         $(INSTALL_DATA) $$file $(DESTDIR)${gxx_include_dir}; done
+       $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${std_builddir}
        for file in ${std_headers_rename}; do \
-         $(INSTALL_DATA) ${std_builddir}/$${file} ${gxx_include_dir}; done
-       $(mkinstalldirs) ${gxx_include_dir}/${target_builddir}
+         $(INSTALL_DATA) ${std_builddir}/$${file} $(DESTDIR)${gxx_include_dir}/${std_builddir}; done
+       $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${target_builddir}
        for file in ${target_headers} ${target_headers_extra} \
         ${thread_target_headers}; do \
-         $(INSTALL_DATA) $${file} ${gxx_include_dir}/${target_builddir}; done
+         $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${target_builddir}; done
 
 # By adding these files here, automake will remove them for 'make clean'
 #CLEANFILES = ${allstamps}