[Patch] Fixup more relative directories when building --enable-debug

[Brad Spencer]

I'm finally getting a chance to try out the new --enable-debug, and I
ran into a snag when compiling off the cvs trunk.  Some of the errors
are shown below.

I think that src/Makefile.in just needs a few more directories fixed.
I've guessed at which ones need manipulated based on which ones
started with "../" in my build directory's debug/Makefile.  A patch
that made it build (and install) cleanly from scratch is attached.

Also, I noticed that the '.' characters in the sed commands were not
escaped, which caused a few lines to get chewed up on my first
attempt.  I fixed this as well.  And by the way, is there a reason
this isn't just done with a pipe? 

...

if test ! -d debug; then \
  mkdir -p debug; \
  (cd debug; \
  cp ../Makefile .; \
  sed 's/top_builddir = ../top_builddir = ..\/../g' \
  < Makefile > temp.1; \
  sed 's/all-local: build_debug/all-local:/g' < temp.1 > temp.2; \
  sed 's/install-data-local: install_debug/install-data-local:/g' \
  < temp.2 > temp.3; \
          mv temp.3 Makefile) ; \
fi; \
echo `date` > stamp-debug; 
(cd debug && make CXXFLAGS='-g3 -O0' all)
make[4]: Entering directory `/build/eng-linux1/spencer/gcc-cross/i686-pc-linux-gnu/build-gcc/i686-pc-linux-gnu/libstdc++-v3/src/debug'
cd ../../../../../cvs-gcc/gcc/libstdc++-v3 && automake --cygnus src/Makefile
/bin/sh: cd: ../../../../../cvs-gcc/gcc/libstdc++-v3: No such file or directory
make[4]: *** [../../../../../cvs-gcc/gcc/libstdc++-v3/src/Makefile.in] Error 1
        
-- 
------------------------------------------------------------------
Brad Spencer - spencer@infointeractive.com - "It's quite nice..."
Systems Architect | InfoInterActive Corp. | A Canadian AOL Company
-------------- next part --------------
Index: Makefile.in
===================================================================
RCS file: /cvsroot/gcc/gcc/libstdc++-v3/src/Makefile.in,v
retrieving revision 1.164
diff -u -p -r1.164 Makefile.in
--- Makefile.in	6 Jan 2003 21:22:59 -0000	1.164
+++ Makefile.in	7 Jan 2003 21:05:31 -0000
@@ -595,12 +595,15 @@ stamp-debug: 
 	  mkdir -p ${debugdir}; \
 	  (cd ${debugdir}; \
 	  cp ../Makefile .; \
-	  sed 's/top_builddir = ../top_builddir = ..\/../g' \
+	  sed 's/top_builddir = \.\./top_builddir = ..\/../g' \
 	  < Makefile > temp.1; \
-	  sed 's/all-local: build_debug/all-local:/g' < temp.1 > temp.2; \
+	  sed 's/srcdir = \.\./srcdir = ..\/../g' < temp.1 > temp.2; \
+	  sed 's/glibcpp_basedir = \.\./glibcpp_basedir = ..\/../g' < temp.2 \
+	  > temp.3; \
+	  sed 's/all-local: build_debug/all-local:/g' < temp.3 > temp.4; \
 	  sed 's/install-data-local: install_debug/install-data-local:/g' \
-	  < temp.2 > temp.3; \
-          mv temp.3 Makefile) ; \
+	  < temp.4 > temp.5; \
+          mv temp.5 Makefile) ; \
 	fi; \
 	echo `date` > stamp-debug;