diff options
| -rw-r--r-- | libstdc++/ChangeLog | 8 | ||||
| -rw-r--r-- | libstdc++/configure.in | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/libstdc++/ChangeLog b/libstdc++/ChangeLog index 269f8ba..306fe63 100644 --- 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 d7e8d78..508f1d5 100644 --- 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 |