--- a/src/Imakefile~	2004-02-08 18:54:15.000000000 +0100
+++ b/src/Imakefile	2004-02-08 18:54:48.000000000 +0100
@@ -12,7 +12,7 @@
 #endif
 
 XCOMM uncomment out the next line if you want to use esd comment out the line below next line
-XCOMM ESDLIB = -lesd -laudiofile
+ESDLIB = -lesd -laudiofile
 
 WMSOUNDLIB = -L../lib -lwmsnd -L/usr/local/lib $(ESDLIB)
 
--- a/lib/Imakefile~	1999-05-02 12:27:29.000000000 +0200
+++ b/lib/Imakefile	2004-02-08 19:16:56.000000000 +0100
@@ -4,7 +4,7 @@
 HEADER_INST = /include
 
 XCOMM Xfree86
-STD_INCLUDES = -I/usr/X11R6/include -I/usr/local/include
+STD_INCLUDES = -I/usr/X11R6/include -I/usr/include
 
 XCOMM Solaris
 XCOMM STD_INCLUDES = -I/usr/openwin/include -I/usr/local/include
@@ -20,7 +20,7 @@
 EXTRA_DEFINES = -DOSS_SOUND
 
 XCOMM uncomment out the next line if you want to use esd
-XCOMM EXTRA_DEFINES = -DESD
+EXTRA_DEFINES = -DESD
 
 XCOMM uncomment out the next line if you want Solaris Support
 XCOMM EXTRA_DEFINES = -DSVR4
--- a/Imakefile~	1999-05-01 16:52:46.000000000 +0200
+++ b/Imakefile	2004-02-08 19:18:47.000000000 +0100
@@ -1,7 +1,7 @@
 #define IHaveSubdirs
 #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)"
 
-PREFIX = /usr/local
+PREFIX = /usr/
 
 DESTDIR = $(PREFIX)
 
--- a/utils/Imakefile~	1999-05-01 11:46:31.000000000 +0200
+++ b/utils/Imakefile	2004-02-08 19:22:03.000000000 +0100
@@ -11,10 +11,10 @@
 #endif
 
 XCOMM uncomment out the next line if you want to use esd comment out the line below next line
-XCOMM ESDLIB = -lesd -laudiofile
+ESDLIB = -lesd -laudiofile
 
-WMSOUNDLIB = -L../lib -lwmsnd -L/usr/local/lib $(ESDLIB)
-STD_INCLUDES = -I/usr/local/include -I/usr/X11R6/include
+WMSOUNDLIB = -L../lib -lwmsnd -L/usr/lib $(ESDLIB)
+STD_INCLUDES = -I/usr/include -I/usr/X11R6/include
 DEPLIBS = $(DEPXLIB) 
 
 LOCAL_LIBRARIES += -lPropList $(XLIB) $(WMSOUNDLIB) $(EFENCELIB)
--- a/lib/Imakefile~	2004-02-08 19:25:30.000000000 +0100
+++ b/lib/Imakefile	2004-02-08 19:26:20.000000000 +0100
@@ -9,7 +9,7 @@
 XCOMM Solaris
 XCOMM STD_INCLUDES = -I/usr/openwin/include -I/usr/local/include
 
-EXTRA_LIBRARIES = 
+EXTRA_LIBRARIES = -Lesd
 
 #ifdef USE_HPUX_SOUND_SERVER
  EXTRA_INCLUDES += -I/opt/audio/include
--- a/utils/Imakefile~	2004-02-08 19:31:16.000000000 +0100
+++ b/utils/Imakefile	2004-02-08 19:31:44.000000000 +0100