Re: Fallout (mostly runtime library-related) from GCC versionnumber change (take two)

[Zack Weinberg <zack at codesourcery dot com>]

Paolo Carlini <pcarlini@suse.de> writes:

> Zack Weinberg wrote:
>
>>>Sure and easy.
>>>
>>>What happens here, on x86-linux, for a very simple
>>>--prefix=/usr/local/gcc-exp configure, is that the whole set of
>>>libstdc++ headers, that should be installed under
>>>/usr/local/gcc-exp/include/c++/4.1.0/, ends up inside
>>>/usr/local/gcc-exp/include/c++/const/
>>>    
>>>
>>Hmm.  I get them in $prefix/include/c++, no intermediate directory.
>>That's not right either, I take it?
>>  
>>
> Hum, yes, unfortunately.

Another place where $(gcc_version) needs to be quoted so it will be
evaluated by the makefile, not the configure script.  Please try the
appended patch on top of the patch I already provided; I will be
re-testing overnight, myself (your daytime, sorry).

zw

===================================================================
Index: libstdc++-v3/acinclude.m4
--- libstdc++-v3/acinclude.m4	24 Feb 2005 18:55:16 -0000	1.307
+++ libstdc++-v3/acinclude.m4	18 Mar 2005 11:58:03 -0000
@@ -752,7 +752,7 @@ AC_DEFUN([GLIBCXX_EXPORT_INSTALL_INFO], 
 
   # Default case for install directory for include files.
   if test $version_specific_libs = no && test $gxx_include_dir = no; then
-    gxx_include_dir='${prefix}'/include/c++/${gcc_version}
+    gxx_include_dir='${prefix}/include/c++/${gcc_version}'
   fi
 
   # Version-specific runtime libs processing.
@@ -762,10 +762,10 @@ AC_DEFUN([GLIBCXX_EXPORT_INSTALL_INFO], 
     # is selected.  FIXME: these variables are misnamed, there are
     # no executables installed in _toolexecdir or _toolexeclibdir.
     if test x"$gxx_include_dir" = x"no"; then
-      gxx_include_dir='${libdir}/gcc/${host_alias}/'$gcc_version/include/c++
+      gxx_include_dir='${libdir}/gcc/${host_alias}/${gcc_version}/include/c++'
     fi
     glibcxx_toolexecdir='${libdir}/gcc/${host_alias}'
-    glibcxx_toolexeclibdir='${toolexecdir}/'$gcc_version'$(MULTISUBDIR)'
+    glibcxx_toolexeclibdir='${toolexecdir}/${gcc_version}$(MULTISUBDIR)'
   fi
 
   # Calculate glibcxx_toolexecdir, glibcxx_toolexeclibdir
===================================================================
Index: libstdc++-v3/configure
--- libstdc++-v3/configure	24 Feb 2005 18:55:17 -0000	1.423
+++ libstdc++-v3/configure	18 Mar 2005 11:58:48 -0000
@@ -99295,7 +99295,7 @@ echo "${ECHO_T}$version_specific_libs" >
 
   # Default case for install directory for include files.
   if test $version_specific_libs = no && test $gxx_include_dir = no; then
-    gxx_include_dir='${prefix}'/include/c++/${gcc_version}
+    gxx_include_dir='${prefix}/include/c++/${gcc_version}'
   fi
 
   # Version-specific runtime libs processing.
@@ -99305,10 +99305,10 @@ echo "${ECHO_T}$version_specific_libs" >
     # is selected.  FIXME: these variables are misnamed, there are
     # no executables installed in _toolexecdir or _toolexeclibdir.
     if test x"$gxx_include_dir" = x"no"; then
-      gxx_include_dir='${libdir}/gcc/${host_alias}/'$gcc_version/include/c++
+      gxx_include_dir='${libdir}/gcc/${host_alias}/${gcc_version}/include/c++'
     fi
     glibcxx_toolexecdir='${libdir}/gcc/${host_alias}'
-    glibcxx_toolexeclibdir='${toolexecdir}/'$gcc_version'$(MULTISUBDIR)'
+    glibcxx_toolexeclibdir='${toolexecdir}/${gcc_version}$(MULTISUBDIR)'
   fi
 
   # Calculate glibcxx_toolexecdir, glibcxx_toolexeclibdir