--- Imakefile.orig	Sun Apr 21 01:25:06 2002
+++ Imakefile	Thu Jan  2 07:53:41 2003
@@ -96,7 +96,7 @@
 XCOMM   to link against symbols inside xanim.
 XCOMM 
 XCOMM ## Linux
-XCOMM LD_FLAGS = -rdynamic
+LD_FLAGS = -rdynamic
 XCOMM
 XCOMM ## SunOS/Solaris use:
 XCOMM LD_FLAGS =
@@ -112,7 +112,7 @@
 XCOMM NOTE: not all machines need the XA_DLL_LIB define.
 XCOMM #########################################################################
 XCOMM 
-XCOMM XA_DLL_DEF = -DXA_DLL -DXA_PRINT
+XA_DLL_DEF = -DXA_DLL -DXA_PRINT
 XCOMM ### Use this only if the above doesn't work
 XCOMM XA_DLL_DEF = -DXA_DLL
 XCOMM
@@ -120,14 +120,14 @@
 XCOMM XA_DLL_LIB = -ldl
 XCOMM
 XCOMM HP/UX should use the following:
-XA_DLL_DEF = -DXA_HPDLL
-XA_DLL_LIB = -Wl,-E -ldld
+XCOMM XA_DLL_DEF = -DXA_HPDLL
+XCOMM XA_DLL_LIB = -Wl,-E -ldld
 XCOMM
 XCOMM
 XCOMM If you'd like to change the default directory that XAnim searches while
 XCOMM looking for dlls, then change the directory below.
 XCOMM
-XA_DLL_PATH = /usr/local/xanim/mods
+XA_DLL_PATH = $(LIBDIR)/xanim
 
 
 XCOMM #########################################################################
@@ -319,8 +319,8 @@
 XCOMM  XA_AUDIO_LIBS = -lc
 XCOMM  
 XCOMM  -- Also FreeBSD, and BSDI with SBlast-BSD-1.5 (development stages)------
-XCOMM  XA_AUDIO_DEFS = -DXA_LINUX_AUDIO
-XCOMM  XA_AUDIO_LIBS = -lc
+XA_AUDIO_DEFS = -DXA_LINUX_AUDIO
+XA_AUDIO_LIBS = -lc
 XCOMM 
 XCOMM  -- TOWNS Linux 16 bit PCM ----------------------------------------------
 XCOMM  XA_AUDIO_DEFS = -DXA_TOWNS_AUDIO
@@ -351,9 +351,9 @@
 XCOMM  XA_AUDIO_LIBS = -lAlib
 XCOMM  --
 XCOMM  -- HP/UX 10.x AServer
-XA_AUDIO_DEFS = -DXA_HP_AUDIO -DXA_HP10
-XA_AUDIO_LIBS = -L/opt/audio/lib -lAlib
-XA_AUDIO_INCS = -I/opt/audio/include
+XCOMM  XA_AUDIO_DEFS = -DXA_HP_AUDIO -DXA_HP10
+XCOMM  XA_AUDIO_LIBS = -L/opt/audio/lib -lAlib
+XCOMM  XA_AUDIO_INCS = -I/opt/audio/include
 XCOMM 
 XCOMM  ------ AF (AudioFile) Support ------------------------------------------
 XCOMM  -- You need to indicate where the AF libraries libAFUtil.a and libAF.a
@@ -447,7 +447,7 @@
 XCOMM    -- following symbols(XmbufDisplayBuffers, XmbufQueryExtension,
 XCOMM    --  XmbufCreateBuffers).
 XCOMM    -- NOTE_8: HP-UX machines need to comment this out.
-XCOMM  XA_MULTIBUF = -DXMBUF
+XA_MULTIBUF = -DXMBUF
 XCOMM 
 XCOMM ###########
 XCOMM 
@@ -470,7 +470,7 @@
 
 PROGRAMS = $(XANIM)
 
-INCLUDES = -I$(INCDIR) $(XA_INCS)
+INCLUDES = -I$(INCDIR)/X11 $(XA_INCS)
 
    LIBS1 = $(XA_LIBS) $(EXTENSIONLIB) $(XTOOLLIB) $(XLIB) -lm
 DEPLIBS1 = $(DEPEXTENSIONLIB) $(DEPXTOOLLIB) $(DEPXLIB)