re PR libstdc++/45711 (Building with "--enable-libstdcxx-debug" fails during install)

Fix PR libstdc++/45711.

libstdc++-v3/:
	PR libstdc++/45711
	* src/Makefile.am (stamp-debug): Also adjust possibly-relative
	file names in MKDIR_P, and, for consistency, also top_build_prefix.
	* src/Makefile.in: Regenerate.

From-SVN: r164451

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index bfcc965809c96243d2a85534ce31fa6afd16003f..4e96eab2e319049cded4c7caf40e352f5f3e0b23 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2010-09-20  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       PR libstdc++/45711
+       * src/Makefile.am (stamp-debug): Also adjust possibly-relative
+       file names in MKDIR_P, and, for consistency, also top_build_prefix.
+       * src/Makefile.in: Regenerate.
+
 2010-09-19  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * include/ext/throw_allocator.h

diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am
index d5194c3366e6431c4140470620cc8e85fd248283..bd748aadb6e66cb3f3572b86f1ccfb69ff4cff27 100644 (file)
--- a/libstdc++-v3/src/Makefile.am
+++ b/libstdc++-v3/src/Makefile.am
@@ -421,13 +421,16 @@ endif
 debugdir = debug
 
 # Build a set of debug objects here.
+# Take care to fix all possibly-relative paths.
 stamp-debug:
        if test ! -d ${debugdir}; then \
          mkdir -p ${debugdir}; \
          (cd ${debugdir}; \
          sed -e 's/top_builddir = \.\./top_builddir = ..\/../' \
+             -e 's/top_build_prefix = \.\./top_build_prefix = ..\/../' \
              -e 's/srcdir = \.\./srcdir = ..\/../' \
              -e 's/glibcxx_basedir = \.\./glibcxx_basedir = ..\/../' \
+             -e 's/MKDIR_P = \.\./MKDIR_P = ..\/../' \
              -e 's/all-local: build_debug/all-local:/' \
              -e 's/install-data-local: install_debug/install-data-local:/' \
          < ../Makefile > Makefile) ; \

diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in
index 92390975740d9028e6370e39a88e11f1030bc62c..ee1c9935c76e2b412901e461c62480faa7b0050e 100644 (file)
--- a/libstdc++-v3/src/Makefile.in
+++ b/libstdc++-v3/src/Makefile.in
@@ -946,13 +946,16 @@ future.o: future.cc
 @GLIBCXX_BUILD_DEBUG_FALSE@install-data-local:
 
 # Build a set of debug objects here.
+# Take care to fix all possibly-relative paths.
 stamp-debug:
        if test ! -d ${debugdir}; then \
          mkdir -p ${debugdir}; \
          (cd ${debugdir}; \
          sed -e 's/top_builddir = \.\./top_builddir = ..\/../' \
+             -e 's/top_build_prefix = \.\./top_build_prefix = ..\/../' \
              -e 's/srcdir = \.\./srcdir = ..\/../' \
              -e 's/glibcxx_basedir = \.\./glibcxx_basedir = ..\/../' \
+             -e 's/MKDIR_P = \.\./MKDIR_P = ..\/../' \
              -e 's/all-local: build_debug/all-local:/' \
              -e 's/install-data-local: install_debug/install-data-local:/' \
          < ../Makefile > Makefile) ; \