diff -ru Imakefile.orig Imakefile
--- Imakefile.orig	Fri Sep 20 22:44:50 1996
+++ Imakefile	Mon Feb  3 11:26:40 1997
@@ -57,13 +57,13 @@
 #
 
 # Full path for directory that will hold the trap handler file:
-TRAP_DIR = .
+TRAP_DIR = $(PREFIX)/share/spim
 
 # Full path for the directory that will hold the executable files:
-BIN_DIR = /usr/unsup/bin
+BIN_DIR = $(PREFIX)/bin
 
 # Full path for the directory that will hold the man files:
-MAN_DIR = /var/unsup/man
+MAN_DIR = $(PREFIX)/man/man1
 
 
 # If you have flex, use it instead of lex.  If you use flex, define this
@@ -164,8 +164,8 @@
 NormalProgramTarget(cl-spim_sub,$(CLOBJS),,,)
 NormalProgramTarget(cl-xspim_sub,$(XCLOBJS),$(DEPLIBS),$(LOCALLIBS),$(SYSLIBS))
 
-InstallProgram(spim,$(BIN_DIR))
-InstallProgram(xspim,$(BIN_DIR))
+InstallProgram(cl-spim,$(BIN_DIR))
+InstallProgram(cl-xspim,$(BIN_DIR))
 InstallManPage(spim,$(MAN_DIR))
 InstallManPage(xspim,$(MAN_DIR))
 InstallNonExec(trap.handler,$(TRAP_DIR))
@@ -291,7 +291,7 @@
 	mv -f lex.yy.c.xx lex.yy.c
 
 depend::
-	makedepend -w10 *.c
+	makedepend -w10 -I$(X11BASE)/include *.c
 
 #
 # DO NOT DELETE THIS LINE -- make depend depends on it.