--- Makefile.in.orig	2006-03-29 21:10:29.000000000 -0500
+++ Makefile.in	2006-04-29 00:45:22.000000000 -0400
@@ -103,9 +103,9 @@
 endif
 
 %.o: %.psr
-	./${PSR} @PSRFLAGS@ -cheader psrhead/$(patsubst %.o,%.h,$@) -fname $(patsubst %.o,%,$@) temppsr.c $<
-	@CC@ @CFLAGS@ -O1 -o $@ -c temppsr.c
-	rm -f temppsr.c
+	./${PSR} @PSRFLAGS@ -cheader psrhead/$(patsubst %.o,%.h,$@) -fname $(patsubst %.o,%,$@) temppsr_$(patsubst %.o,%,$@).c $<
+	@CC@ @CFLAGS@ -O1 -o $@ -c temppsr_$(patsubst %.o,%,$@).c
+	rm -f temppsr_$(patsubst %.o,%,$@).c
 
 ALL: @ZSNESEXE@
 
@@ -300,7 +300,7 @@
 	rm -f @prefix@/bin/$(notdir @ZSNESEXE@) @prefix@/man/man5/zsnes.5
 
 clean:
-	rm -f ${ZOBJS} ${PSR} psrhead/*.h temppsr.c @ZSNESEXE@
+	rm -f ${ZOBJS} ${PSR} psrhead/*.h temppsr_*.c @ZSNESEXE@
 
 distclean:
-	rm -f ${ZOBJS} ${PSR} psrhead/*.h temppsr.c @ZSNESEXE@ Makefile aclocal.m4 configure config.cache config.log config.status config.h
+	rm -f ${ZOBJS} ${PSR} psrhead/*.h temppsr_*.c @ZSNESEXE@ Makefile aclocal.m4 configure config.cache config.log config.status config.h
--- makefile.ms.orig	2006-03-29 21:10:29.000000000 -0500
+++ makefile.ms	2006-04-29 00:45:23.000000000 -0400
@@ -239,13 +239,13 @@
 endif
 
 %${OE}: %.psr
-	${PSR} -D${OS} -cheader psrhead/$(patsubst %${OE},%.h,$@) -fname $(patsubst %${OE},%,$@) temppsr.c $<
+	${PSR} -D${OS} -cheader psrhead/$(patsubst %${OE},%.h,$@) -fname $(patsubst %${OE},%,$@) temppsr_$(patsubst %${OE},%,$@).c $<
 ifneq (${ENV},msvc)
-	${CC} -o $@ -c temppsr.c
+	${CC} -o $@ -c temppsr_$(patsubst %${OE},%,$@).c
 else
-	cl /nologo /Ox /G6 /c /EHsc /D__WIN32__ /Fo$@ temppsr.c
+	cl /nologo /Ox /G6 /c /EHsc /D__WIN32__ /Fo$@ temppsr_$(patsubst %${OE},%,$@).c
 endif
-	${DELETECOMMAND} temppsr.c
+	${DELETECOMMAND} temppsr_$(patsubst %${OE},%,$@).c
 
 ALL: zsnes
 	${DELETECOMMAND} version${OE}