diff -Naur src_old/Makefile src/Makefile
--- src_old/Makefile	2008-07-18 09:38:32.000000000 -0400
+++ src/Makefile	2008-07-18 09:40:02.000000000 -0400
@@ -165,8 +165,9 @@
 
 hasshsgr.h: chkshsgr choose compile hasshsgr.h1 hasshsgr.h2 load \
 tryshsgr.c warn-shsgr
-	./chkshsgr || ( cat warn-shsgr; exit 1 )
-	./choose clr tryshsgr hasshsgr.h1 hasshsgr.h2 > hasshsgr.h
+	cp hasshsgr.h1 hasshsgr.h
+# SAM  ./chkshsgr || ( cat warn-shsgr; exit 1 )
+# SAM  ./choose clr tryshsgr hasshsgr.h1 hasshsgr.h2 > hasshsgr.h
 
 haswaitp.h: choose compile haswaitp.h1 haswaitp.h2 load trywaitp.c
 	./choose cl trywaitp haswaitp.h1 haswaitp.h2 > haswaitp.h
@@ -265,7 +266,7 @@
 rts: envdir envuidgid fghack matchtest multilog pgrphack \
 readproctitle rts.tests setlock setuidgid softlimit supervise svc \
 svok svscan svscanboot svstat tai64n tai64nlocal
-	env - /bin/sh rts.tests 2>&1 | cat -v > rts
+# SAM env - /bin/sh rts.tests 2>&1 | cat -v > rts
 
 scan_ulong.o: compile scan.h scan_ulong.c
 	./compile scan_ulong.c
diff -Naur src_old/error.h src/error.h
--- src_old/error.h	2008-07-18 09:38:32.000000000 -0400
+++ src/error.h	2008-07-18 09:38:52.000000000 -0400
@@ -3,7 +3,7 @@
 #ifndef ERROR_H
 #define ERROR_H
 
-extern int errno;
+#include <errno.h>
 
 extern int error_intr;
 extern int error_nomem;