Oops - fixed typos in previous delta

From-SVN: r25538

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index a73df5e8b05aa162c4a857bb7d3016acc91b5897..9ad91068521c7c8a47485b3cb40d123f571f1d8f 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -269,6 +269,7 @@ libsubdir = $(libdir)/gcc-lib/$(target_alias)/$(version)
 # Used to produce a relative $(gcc_tooldir) in gcc.o
 unlibsubdir = ../../..
 # Directory in which to find other cross-compilation tools and headers.
+dollar = @dollar@
 # Used in install-cross.
 gcc_tooldir = @gcc_tooldir@
 # Since tooldir does not exist at build-time, use -B$(build_tooldir)/bin/

diff --git a/gcc/configure b/gcc/configure
index f4d09cfc87982a5f6e8cc39b173bdf7eb0225832..c4e87446a4d5b7da6928f5e5878ad0d672339e0c 100755 (executable)
--- a/gcc/configure
+++ b/gcc/configure
@@ -8372,8 +8372,8 @@ else
 #   /foo/       /foo/bar/         ../
 #   /foo        /foo/bar/ugg      ../../
 #
-    gcc_tooldir="$(libsubdir)/$(unlibsubdir)/\`echo \$(exec_prefix) |
-sed -e 's|^\$(prefix)||' -e 's|/$||' -e 's|^[^/]|/|' -e 's|/[^/]*|../|g'\`$(target_alias)"
+    dollar='$$'
+    gcc_tooldir="\$(libsubdir)/\$(unlibsubdir)/\`echo \$(exec_prefix) | sed -e 's|^\$(prefix)||' -e 's|/\$(dollar)||' -e 's|^[^/]|/|' -e 's|/[^/]*|../|g'\`\$(target_alias)"
 fi
 
 
@@ -8687,6 +8687,7 @@ s%@inhibit_libc@%$inhibit_libc%g
 s%@sched_prefix@%$sched_prefix%g
 s%@sched_cflags@%$sched_cflags%g
 s%@gcc_tooldir@%$gcc_tooldir%g
+s%@dollar@%$dollar%g
 s%@objdir@%$objdir%g
 s%@subdirs@%$subdirs%g
 s%@all_languages@%$all_languages%g

diff --git a/gcc/configure.in b/gcc/configure.in
index e7a0a498f253263c80741aaba58eb04e51fbd2d4..743d65fc7fa8ad8e8dda022df873668760531958 100644 (file)
--- a/gcc/configure.in
+++ b/gcc/configure.in
@@ -4260,11 +4260,12 @@ changequote(<<, >>)dnl
 #   /foo/       /foo/bar/         ../
 #   /foo        /foo/bar/ugg      ../../
 #
-    gcc_tooldir="$(libsubdir)/$(unlibsubdir)/\`echo \$(exec_prefix) |
-sed -e 's|^\$(prefix)||' -e 's|/$||' -e 's|^[^/]|/|' -e 's|/[^/]*|../|g'\`$(target_alias)"
+    dollar='$$'
+    gcc_tooldir="\$(libsubdir)/\$(unlibsubdir)/\`echo \$(exec_prefix) | sed -e 's|^\$(prefix)||' -e 's|/\$(dollar)||' -e 's|^[^/]|/|' -e 's|/[^/]*|../|g'\`\$(target_alias)"
 changequote([, ])dnl
 fi
 AC_SUBST(gcc_tooldir)
+AC_SUBST(dollar)
 
 # Warn if using init_priority.
 AC_MSG_CHECKING(whether to enable init_priority by default)