From 53e174d692facac03f31752ad77fa80aecc7648b Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Wed, 22 Nov 1995 18:18:21 +0000 Subject: * Makefile.in (EXPECT): Use $$r, not $${rootme}. (check): Set r, not rootme. --- binutils/ChangeLog | 5 +++++ binutils/Makefile.in | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index b864060..79ebd28 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,8 @@ +Wed Nov 22 13:17:15 1995 Ian Lance Taylor + + * Makefile.in (EXPECT): Use $$r, not $${rootme}. + (check): Set r, not rootme. + Tue Nov 21 18:04:09 1995 Ian Lance Taylor * configure.in: Use BFD_NEED_DECLARATION. diff --git a/binutils/Makefile.in b/binutils/Makefile.in index 1a4a8eb..f8508f2 100644 --- 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 \ -- cgit v1.1