PATCH for the egcs-19980628 libstdc++/Makefile.in problem

[Manfred Hollstein <manfred at s-direktnet dot de>]

On Fri, 3 July 1998, 14:16:59, carlo@runaway.xs4all.nl wrote:

 > | Around line 277 of libstdc++/Makefile:
 > | 
 > |        if [ x$(libsubdir) = x ] || [
 > | x$(enable_version_specific_runtime_libs) != xyes ]; then \
 > |           INSTALLDIR=$(libdir); \
 > |         else \
 > |           INSTALLDIR=$(libsubdir); \
 > 
 > Hmm, on second thought - I am not sure if these
 > in-script INSTALLDIR = ..;\ don't need to be replaced
 > too.  In that case a different regular expression
 > would be needed of course.  I don't understand
 > why during cross compiling we install in $(tooldir)
 > and otherwise not - but this specific Makefile.in
 > part doesn't seem to take it into account.
 > 
 > If we need something like
 > 
 > |        if [ x$(libsubdir) = x ] || [
 > | x$(enable_version_specific_runtime_libs) != xyes ]; then \
 > |           INSTALLDIR=$(tooldir)/lib ; \
 > |         else \
 > |           INSTALLDIR=$(tooldir)/lib ; \
 > 
 > then the following would do the job:
 > 
 > sed -e 's|INSTALLDIR.*=[^;]*|INSTALLDIR = $(tooldir)/lib |'

Thanks to Carlo and Joel for finding this out. I've changed the sed
pattern to reuse the original whitespace around the assignment operator.

manfred

1998-07-06  Manfred Hollstein  <manfred@s-direktnet.de>

	* configure.in (INSTALLDIR): Make sed pattern failsafe.

diff -up egcs/libstdc++/configure.in.orig egcs/libstdc++/configure.in
--- egcs/libstdc++/configure.in.orig	Thu Mar  5 01:28:14 1998
+++ egcs/libstdc++/configure.in	Mon Jul  6 08:55:49 1998
@@ -100,7 +100,7 @@ EXTRA_DISTCLEAN='target-mkfrag'
 if [ -n "${with_cross_host}" ] ; then
     rm -f Makefile.tem
     sed \
-        -e 's|INSTALLDIR.*=.*$|INSTALLDIR = $(tooldir)/lib|' \
+        -e 's|\(INSTALLDIR[ 	]*=[ 	]*\)[^ 	;]*|\1$(tooldir)/lib|' \
         Makefile >Makefile.tem
     mv -f Makefile.tem Makefile
 fi