diff --git a/usr.bin/tr/Makefile b/usr.bin/tr/Makefile index 30bdc44..4779411 100644 --- a/usr.bin/tr/Makefile +++ b/usr.bin/tr/Makefile @@ -1,6 +1,6 @@ # # This makefile is intended for use with dmake(1) on Apple IIGS -# $Id: Makefile,v 1.3 1997/10/03 04:13:06 gdr Exp $ +# $Id: Makefile,v 1.4 1998/03/08 17:49:40 gdr-ftp Exp $ # # Created by Dave Tribby, August 1997 @@ -11,15 +11,12 @@ SRCS= tr.c str.c # If optimization wasn't set on the command line use 79, since # tr has been tested to work at that level. -.IF $(OPTIMIZE) == $(NULL) - OPTIMIZE=79 -.END +OPTIMIZE *= 79 .INCLUDE : /src/gno/prog.mk # # Additional dependancies # - -tr.o:: extern.h -str.o:: extern.h +tr.o: extern.h +str.o: extern.h diff --git a/usr.bin/tr/tests/dotests b/usr.bin/tr/tests/dotests index 69be376..9f9f021 100644 --- a/usr.bin/tr/tests/dotests +++ b/usr.bin/tr/tests/dotests @@ -1,9 +1,9 @@ # Tests for tr command; invoked by command file "fulltests" # Written by Dave Tribby (August 1997) -# $Id: dotests,v 1.2 1997/10/03 04:11:05 gdr Exp $ +# $Id: dotests,v 1.3 1998/03/08 17:49:44 gdr-ftp Exp $ # Location of the tr command to be tested -set testcmd="../tr" +set testcmd="/obj/gno/usr.bin/tr/tr" # Record starting time echo -n "Testing command $testcmd beginning at" diff --git a/usr.bin/tr/tests/fulltests b/usr.bin/tr/tests/fulltests index d01b828..7d1a563 100644 --- a/usr.bin/tr/tests/fulltests +++ b/usr.bin/tr/tests/fulltests @@ -1,6 +1,6 @@ # gsh script to run tests and collect results # Written by Dave Tribby * August 1997 -# $Id: fulltests,v 1.3 1997/10/03 04:11:06 gdr Exp $ +# $Id: fulltests,v 1.4 1998/03/08 17:49:45 gdr-ftp Exp $ # Name of gsh script containing test cases set command="dotests" @@ -12,7 +12,7 @@ set raw_file="/tmp/rawlist" set result_file="test.list" # Location of tr command that knows how to handle classes -set trcmd="/src/gno/usr.bin/tr/tr" +set trcmd="/obj/gno/usr.bin/tr/tr" # --- Begin the tests ---