2012-04-03  Bernhard Reutner-Fischer  <al...@gcc.gnu.org>

        PR bootstrap/52840
        * src/Makefile.am (build-debug): Do not adjust vpath dir, remove
        Makefile.tmp
        * src/Makefile.in: Adjust as per above.

Signed-off-by: Bernhard Reutner-Fischer <rep.dot....@gmail.com>
---
 libstdc++-v3/src/Makefile.am |    3 ++-
 libstdc++-v3/src/Makefile.in |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am
index 28430cf..52cf0d5 100644
--- a/libstdc++-v3/src/Makefile.am
+++ b/libstdc++-v3/src/Makefile.am
@@ -293,8 +293,9 @@ build-debug: stamp-debug
          mv Makefile Makefile.tmp; \
          sed -e 's,all-local: all-once,all-local:,' \
              -e 's,install-data-local: install-data-once,install-data-local:,' 
\
-             -e 's,src/c,src/debug/c,' \
+             -e '/vpath/!s,src/c,src/debug/c,' \
          < Makefile.tmp > Makefile ; \
+         rm -f Makefile.tmp ; \
          $(MAKE) CXXFLAGS='$(DEBUG_FLAGS)' \
          toolexeclibdir=$(glibcxx_toolexeclibdir)/debug all) ;
 
diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in
index 3c1facf..d211ba9 100644
--- a/libstdc++-v3/src/Makefile.in
+++ b/libstdc++-v3/src/Makefile.in
@@ -914,8 +914,9 @@ build-debug: stamp-debug
          mv Makefile Makefile.tmp; \
          sed -e 's,all-local: all-once,all-local:,' \
              -e 's,install-data-local: install-data-once,install-data-local:,' 
\
-             -e 's,src/c,src/debug/c,' \
+             -e '/vpath/!s,src/c,src/debug/c,' \
          < Makefile.tmp > Makefile ; \
+         rm -f Makefile.tmp ; \
          $(MAKE) CXXFLAGS='$(DEBUG_FLAGS)' \
          toolexeclibdir=$(glibcxx_toolexeclibdir)/debug all) ;
 
-- 
1.7.9.1

Reply via email to