--- ./lib/audio/Alibint.c	Tue Dec 12 23:22:37 2000
+++ ../nas-1.4.2/./lib/audio/Alibint.c	Wed Dec  5 16:11:30 2001
@@ -710,8 +710,10 @@
 	    
 	    if (bytes_read > 0) 
 	      {
+	        AuBool overran = (iov[0].iov_len < bytes_read);
 		size -= bytes_read;
-	    	if ((iov[0].iov_len -= bytes_read) < 0) 
+		iov[0].iov_len -= bytes_read;
+	    	if (overran)
 		  {
 		    iov[1].iov_len += iov[0].iov_len;
 
--- ./server/dda/sgi/ausgi.c	Sat Sep 11 23:03:37 1999
+++ ../nas-1.4.2/./server/dda/sgi/ausgi.c	Wed Dec  5 16:11:51 2001
@@ -41,7 +41,7 @@
 #include <sys/param.h>
 
 /* SGI's AudioLibrary interface (avoid name conflict with NetAudio's audio.h */
-#include </usr/include/audio.h>
+#include <dmedia/audio.h>
 
 #include <audio/audio.h>
 #include <audio/Aproto.h>
--- ./config/NetAudio.tmpl	Sun Mar 18 15:36:39 2001
+++ ../nas-1.4.2/./config/NetAudio.tmpl	Wed Dec  5 16:16:39 2001
@@ -30,12 +30,12 @@
 
 #ifndef WIN32
 #define Date @date
-#define RmTree(dir)		$(RM) -r dir
-#define AuPassCDebugFlags	'CDEBUGFLAGS=$(CDEBUGFLAGS)'
-#define Obj(x)			x.o
-#define Exe(x)			x
-#define LibPre()		lib
-#define Lib(x)			LibPre()x.a
+#define RmTree(dir) $(RM) -r dir
+#define AuPassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
+#define Obj(x) x.o
+#define Exe(x) x
+#define LibPre() lib
+#define Lib(x) LibPre()x.a
 #else /* WIN32 */
 #define ImakeSubCmdHelper	$(IMAKE_CMD)
 #define Date
@@ -226,9 +226,9 @@
 	@(rel=`cat $(TOP)/RELEASE | \				     	    @@\
 	  sed 's/Network Audio System Release //'`; \			    @@\
 	  sed -f $(TOP)/config/mungeman \				    @@\
-	      -e "s/_RELEASE_/$$rel/" < file.man > tmp.man)		    @@\
-	InstallManPageLong(tmp,destdir,dest)				    @@\
-	@$(RM) tmp.man
+	      -e "s/_RELEASE_/$$rel/" < file.man > file-tmp.man)	    @@\
+	InstallManPageLong(file-tmp,destdir,dest)			    @@\
+	@$(RM) file-tmp.man
 
 #define SingleAudioProgram(program)					    @@\
 	InstallProgram(program,$(BINDIR))				    @@\