* Makefile.in (EXPECT): Use $$r, not $${rootme}.
(check): Set r, not rootme.
This commit is contained in:
parent
fa63d1ef23
commit
53e174d692
2 changed files with 10 additions and 5 deletions
|
@ -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>
|
Tue Nov 21 18:04:09 1995 Ian Lance Taylor <ian@cygnus.com>
|
||||||
|
|
||||||
* configure.in: Use BFD_NEED_DECLARATION.
|
* configure.in: Use BFD_NEED_DECLARATION.
|
||||||
|
|
|
@ -161,8 +161,8 @@ ADDL_LIBS = $(MALLOC) $(BULIBS) $(BFD) $(LIBIBERTY)
|
||||||
BFD = ../bfd/libbfd.a
|
BFD = ../bfd/libbfd.a
|
||||||
OPCODES = ../opcodes/libopcodes.a
|
OPCODES = ../opcodes/libopcodes.a
|
||||||
|
|
||||||
EXPECT = `if [ -f $${rootme}/../expect/expect ] ; then \
|
EXPECT = `if [ -f $$r/../expect/expect ] ; then \
|
||||||
echo $${rootme}/../expect/expect ; \
|
echo $$r/../expect/expect ; \
|
||||||
else echo expect ; fi`
|
else echo expect ; fi`
|
||||||
RUNTEST = `if [ -f ${srcdir}/../dejagnu/runtest ] ; then \
|
RUNTEST = `if [ -f ${srcdir}/../dejagnu/runtest ] ; then \
|
||||||
echo ${srcdir}/../dejagnu/runtest ; \
|
echo ${srcdir}/../dejagnu/runtest ; \
|
||||||
|
@ -177,7 +177,7 @@ CC_FOR_TARGET = ` \
|
||||||
echo $$r/../gcc/xgcc -B$$r/../gcc/; \
|
echo $$r/../gcc/xgcc -B$$r/../gcc/; \
|
||||||
fi; \
|
fi; \
|
||||||
else \
|
else \
|
||||||
if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
|
if [ "@host@" = "@target@" ] ; then \
|
||||||
echo $(CC); \
|
echo $(CC); \
|
||||||
else \
|
else \
|
||||||
echo gcc | sed '$(program_transform_name)'; \
|
echo gcc | sed '$(program_transform_name)'; \
|
||||||
|
@ -226,10 +226,10 @@ site.exp: ./config.status Makefile
|
||||||
-@rm -f ./tmp?
|
-@rm -f ./tmp?
|
||||||
|
|
||||||
check: site.exp
|
check: site.exp
|
||||||
rootme=`pwd`; export rootme ; \
|
r=`pwd`; export r ; \
|
||||||
srcroot=`cd ${srcdir}; pwd` ; export srcroot ; \
|
srcroot=`cd ${srcdir}; pwd` ; export srcroot ; \
|
||||||
EXPECT=${EXPECT} ; export EXPECT ; \
|
EXPECT=${EXPECT} ; export EXPECT ; \
|
||||||
if [ -f $$rootme/../expect/expect ] ; then \
|
if [ -f $$r/../expect/expect ] ; then \
|
||||||
TCL_LIBRARY=$${srcroot}/../tcl/library ; \
|
TCL_LIBRARY=$${srcroot}/../tcl/library ; \
|
||||||
export TCL_LIBRARY ; else true; fi ; \
|
export TCL_LIBRARY ; else true; fi ; \
|
||||||
$(RUNTEST) --tool binutils --srcdir $(srcdir)/testsuite \
|
$(RUNTEST) --tool binutils --srcdir $(srcdir)/testsuite \
|
||||||
|
|
Loading…
Add table
Reference in a new issue