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

From-SVN: r20965

diff --git a/libstdc++/ChangeLog b/libstdc++/ChangeLog
index 269f8ba1e584ee9a7e2e4e86753fbcca21fdb266..306fe63cae48cd2491510b6b820688aecdf8e08e 100644 (file)
--- a/libstdc++/ChangeLog
+++ b/libstdc++/ChangeLog
@@ -1,3 +1,7 @@
+1998-07-06  Manfred Hollstein  <manfred@s-direktnet.de>
+
+       * configure.in (INSTALLDIR): Make sed pattern failsafe.
+
 1998-07-06  Ulrich Drepper  <drepper@cygnus.com>
 
        * std/bastring.h (class basic_string): Correct iterator return
@@ -13,8 +17,8 @@
        * Makefile.in (INSTALLDIR): Add comment to document the fact,
        this macro will be properly initialized at make's runtime.
        (install): Add initialization of INSTALLDIR depending on $(libsubdir)
-       and ${enable_version_specific_runtime_libs}; use $${INSTALLDIR} shell variable
-       instead of the $(INSTALLDIR) make macro.
+       and ${enable_version_specific_runtime_libs}; use $${INSTALLDIR} shell
+       variable instead of the $(INSTALLDIR) make macro.
 
 Tue Mar 24 10:13:07 1998  Jason Merrill  <jason@yorick.cygnus.com>
 

diff --git a/libstdc++/configure.in b/libstdc++/configure.in
index d7e8d78a5504840407112da0847ce5d5218ab71d..508f1d5b23408c0a7b3e5ea5b6d689a4fa3458bd 100644 (file)
--- a/libstdc++/configure.in
+++ b/libstdc++/configure.in
@@ -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