X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=config%2Fgxx-include-dir.m4;h=4f54d427f7e2af158ec2946dd4376490b78670d7;hb=ebe2334ee6cb065d2a86688bc9558d62320dd459;hp=87a65adaa38c3cbf7e1abbef3fb492280d0e38aa;hpb=3da796a242a24aea76261f2d7e816e4b801ee69b;p=deliverable%2Fbinutils-gdb.git

diff --git a/config/gxx-include-dir.m4 b/config/gxx-include-dir.m4
index 87a65adaa3..4f54d427f7 100644
--- a/config/gxx-include-dir.m4
+++ b/config/gxx-include-dir.m4
@@ -14,10 +14,16 @@ case "${with_gxx_include_dir}" in
     ;;
   no | "")
     case "${enable_version_specific_runtime_libs}" in
-      yes) gxx_include_dir='${libsubdir}/include/c++' ;;
+      yes) gxx_include_dir='$(libsubdir)/include/c++' ;;
       *)
-	libstdcxx_incdir=c++/${gcc_version}
-	gxx_include_dir='${prefix}/include/'${libstdcxx_incdir} ;;
+	libstdcxx_incdir='c++/$(gcc_version)'
+	gxx_include_dir='include/$(libstdcxx_incdir)'
+	if test -n "$with_cross_host" && 
+           test x"$with_cross_host" != x"no"; then	
+          gxx_include_dir='${prefix}/${target_alias}/'"$gxx_include_dir"
+        else
+          gxx_include_dir='${prefix}/'"$gxx_include_dir"
+        fi;;
     esac ;;
   *) gxx_include_dir=${with_gxx_include_dir} ;;
 esac