diff options
| author | Ian Lance Taylor <ian@airs.com> | 1995-11-22 18:18:21 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@airs.com> | 1995-11-22 18:18:21 +0000 |
| commit | 53e174d692facac03f31752ad77fa80aecc7648b (patch) | |
| tree | cbebdd44cabdfb9bb359fd8a504d91d74014ccce | |
| parent | fa63d1ef2381ff6d08d7d8a04eefbcd7edd081d0 (diff) | |
| download | fsf-binutils-gdb-53e174d692facac03f31752ad77fa80aecc7648b.zip fsf-binutils-gdb-53e174d692facac03f31752ad77fa80aecc7648b.tar.gz fsf-binutils-gdb-53e174d692facac03f31752ad77fa80aecc7648b.tar.bz2 | |
* Makefile.in (EXPECT): Use $$r, not $${rootme}.
(check): Set r, not rootme.
| -rw-r--r-- | binutils/ChangeLog | 5 | ||||
| -rw-r--r-- | 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 <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 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 \ |