From: jason <jason>
Date: Thu, 28 Feb 2002 11:18:52 +0000 (+0000)
Subject:         * example/calc/Makefile.in (check): Add ./ to CALC value to avoid
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5b5ae22608ffd5e22cd5408fc391d108016dcae9;p=pf3gnuchains%2Fsourceware.git

    * example/calc/Makefile.in (check): Add ./ to CALC value to avoid
        PATH issues.  Add missing ../.
---

diff --git a/dejagnu/ChangeLog b/dejagnu/ChangeLog
index 0301a800b7..9bd1c79645 100644
--- a/dejagnu/ChangeLog
+++ b/dejagnu/ChangeLog
@@ -1,3 +1,8 @@
+2002-02-28  Jason Merrill  <jason@redhat.com>
+
+	* example/calc/Makefile.in (check): Add ./ to CALC value to avoid
+	PATH issues.  Add missing ../.
+
 2002-02-23  Daniel Jacobowitz  <drow@mvista.com>
 
 	* config.guess: Import from master sources, rev 1.232.
diff --git a/dejagnu/example/calc/Makefile.in b/dejagnu/example/calc/Makefile.in
index f892c7b97a..40ed0c02e0 100644
--- a/dejagnu/example/calc/Makefile.in
+++ b/dejagnu/example/calc/Makefile.in
@@ -1,8 +1,8 @@
-# Copyright (C) 92, 93, 94, 95, 96, 97, 98, 1999 Free Software Foundation, Inc.
+# Copyright (C) 92, 93, 94, 95, 96, 97, 98, 99, 2002 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 1, or (at your option)
+# the Free Software Foundation; either version 2, or (at your option)
 # any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -12,7 +12,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 
 # target name
@@ -64,10 +64,10 @@ check:	site.exp all
 	rootme=`pwd`; export rootme; \
         srcdir=${srcdir} ; export srcdir ; \
         EXPECT=${EXPECT} ; export EXPECT ; \
-        if [ -f $${rootme}/../../expect/expect ] ; then  \
-           TCL_LIBRARY=$${srcdir}/../../tcl/library ; \
+        if [ -f $${rootme}/../../../expect/expect ] ; then  \
+           TCL_LIBRARY=$${srcdir}/../../../tcl/library ; \
            export TCL_LIBRARY ; fi ; \
-	${RUNTEST} ${RUNTESTFLAGS} --tool ${PROG} CALC=${PROG} --srcdir ${srcdir}/testsuite
+	${RUNTEST} ${RUNTESTFLAGS} --tool ${PROG} CALC=./${PROG} --srcdir ${srcdir}/testsuite
 
 site.exp: ./config.status Makefile
 	@echo "Making a new config file..."
@@ -104,7 +104,7 @@ configure: $(srcdir)/configure.in $(srcdir)/Makefile.in $(srcdir)/../../aclocal.
 	@echo "Rebuilding configure..."
 	@cd ${srcdir} ;\
 	autoconf --localdir=${srcdir}/../..
-     
+
 config.status:
 	@echo "Rebuilding config.status..."
 	$(SHELL) ./config.status --recheck