diff options
| author | Nick Clifton <nickc@gcc.gnu.org> | 1999-03-02 09:29:26 +0000 |
|---|---|---|
| committer | Nick Clifton <nickc@gcc.gnu.org> | 1999-03-02 09:29:26 +0000 |
| commit | 4c112cda96594f4e4ada2cfeb3c9053725393fe6 (patch) | |
| tree | 25477f0b4a32077c35b3a82076d9b71b8e410bb4 | |
| parent | 8f8d32788b80424b361ed9a7cdad5f6b7d6a5615 (diff) | |
| download | gcc-4c112cda96594f4e4ada2cfeb3c9053725393fe6.zip gcc-4c112cda96594f4e4ada2cfeb3c9053725393fe6.tar.gz gcc-4c112cda96594f4e4ada2cfeb3c9053725393fe6.tar.bz2 | |
Oops - fixed typos in previous delta
From-SVN: r25538
| -rw-r--r-- | gcc/Makefile.in | 1 | ||||
| -rwxr-xr-x | gcc/configure | 5 | ||||
| -rw-r--r-- | gcc/configure.in | 5 |
3 files changed, 7 insertions, 4 deletions
diff --git a/gcc/Makefile.in b/gcc/Makefile.in index a73df5e..9ad9106 100644 --- 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 f4d09cf..c4e8744 100755 --- 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 e7a0a49..743d65f 100644 --- 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) |