diff --git a/bin/uname/Makefile b/bin/uname/Makefile
index c5b6e50..a81fbbe 100644
--- a/bin/uname/Makefile
+++ b/bin/uname/Makefile
@@ -2,7 +2,7 @@
 #
 # Modified for GNO (Apple IIgs) and dmake(1) by Steve Reeves, January 1998
 #
-# $Id: Makefile,v 1.2 1998/02/19 02:24:35 gdr-ftp Exp $
+# $Id: Makefile,v 1.3 1998/03/08 17:24:25 gdr-ftp Exp $
 
 PROG=	uname
 
@@ -10,11 +10,7 @@ DEFINES+=	-DNOID
 
 # Default stack size and optimization (can be overridden by cmd line)
 #   These values have been tested and certified as working
-.IF $(STACK) == $(NULL)
-STACK=	1024
-.END
-.IF $(OPTIMIZE) == $(NULL)
-OPTIMIZE=	127
-.END
+STACK		*= 1024
+OPTIMIZE	*= 127
 
 .INCLUDE:	/src/gno/prog.mk
diff --git a/bin/uname/tests/dotests b/bin/uname/tests/dotests
index aa4083d..5caaa79 100644
--- a/bin/uname/tests/dotests
+++ b/bin/uname/tests/dotests
@@ -1,10 +1,10 @@
 # Tests for tr command; invoked by command file "fulltests"
 #   Adapted from a test script written by Dave Tribby
 #
-# $Id: dotests,v 1.1 1998/02/17 02:50:35 gdr-ftp Exp $
+# $Id: dotests,v 1.2 1998/03/08 17:24:31 gdr-ftp Exp $
 
 # Location of the command to be tested
-set testcmd="../uname"
+set testcmd="/obj/gno/bin/uname/uname"
 
 # Record starting time
 echo -n "Testing command $testcmd beginning at"
diff --git a/bin/uname/tests/fulltests b/bin/uname/tests/fulltests
index 3f77081..1cb9ef1 100644
--- a/bin/uname/tests/fulltests
+++ b/bin/uname/tests/fulltests
@@ -1,6 +1,6 @@
 # gsh script to run tests and collect results
 #   Written by Dave Tribby  *  August 1997
-#   $Id: fulltests,v 1.1 1998/02/17 02:50:36 gdr-ftp Exp $
+#   $Id: fulltests,v 1.2 1998/03/08 17:24:34 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 ---