* Makefile.in (EXPECT): Use $$r, not $${rootme}.

	(check): Set r, not rootme.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index b864060e5c0f3295a99f2896bbae80595c52033b..79ebd284ab7aa22955255e568f7865264b7c593a 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+Wed Nov 22 13:17:15 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+       * Makefile.in (EXPECT): Use $$r, not $${rootme}.
+       (check): Set r, not rootme.
+
 Tue Nov 21 18:04:09 1995  Ian Lance Taylor  <ian@cygnus.com>
 
        * configure.in: Use BFD_NEED_DECLARATION.

diff --git a/binutils/Makefile.in b/binutils/Makefile.in
index 1a4a8eb62e243aa23ac3d771f4b2d328344f9fef..f8508f20df9e02360cce9fe04725987d6bc4da55 100644 (file)
--- a/binutils/Makefile.in
+++ b/binutils/Makefile.in
@@ -161,8 +161,8 @@ ADDL_LIBS = $(MALLOC) $(BULIBS) $(BFD) $(LIBIBERTY)
 BFD = ../bfd/libbfd.a
 OPCODES = ../opcodes/libopcodes.a
 
-EXPECT = `if [ -f $${rootme}/../expect/expect ] ; then \
-          echo $${rootme}/../expect/expect ; \
+EXPECT = `if [ -f $$r/../expect/expect ] ; then \
+          echo $$r/../expect/expect ; \
           else echo expect ; fi`
 RUNTEST = `if [ -f ${srcdir}/../dejagnu/runtest ] ; then \
            echo ${srcdir}/../dejagnu/runtest ; \
@@ -177,7 +177,7 @@ CC_FOR_TARGET = ` \
       echo $$r/../gcc/xgcc -B$$r/../gcc/; \
     fi; \
   else \
-    if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
+    if [ "@host@" = "@target@" ] ; then \
       echo $(CC); \
     else \
       echo gcc | sed '$(program_transform_name)'; \
@@ -226,10 +226,10 @@ site.exp: ./config.status Makefile
        -@rm -f ./tmp?
 
 check: site.exp
-       rootme=`pwd`; export rootme ; \
+       r=`pwd`; export r ; \
        srcroot=`cd ${srcdir}; pwd` ; export srcroot ; \
        EXPECT=${EXPECT} ; export EXPECT ; \
-       if [ -f $$rootme/../expect/expect ] ; then  \
+       if [ -f $$r/../expect/expect ] ; then  \
           TCL_LIBRARY=$${srcroot}/../tcl/library ; \
           export TCL_LIBRARY ; else true; fi ; \
        $(RUNTEST) --tool binutils --srcdir $(srcdir)/testsuite \