$NetBSD: patch-ab,v 1.6 1999/03/28 07:55:05 rh Exp $

--- Imakefile.orig	Sun Mar 21 23:36:26 1999
+++ Imakefile	Sun Mar 28 09:14:27 1999
@@ -96,9 +96,9 @@
 XCOMM   to link against symbols inside xanim.
 XCOMM 
 XCOMM ## Linux
-LD_FLAGS = -rdynamic
+XCOMM LD_FLAGS = -rdynamic
 XCOMM ## SunOS/Solaris use:
-XCOMM  LD_FLAGS =
+LD_FLAGS =
 
 
 XCOMM #########################################################################
@@ -111,17 +111,17 @@
 XCOMM NOTE: not all machines need the XA_DLL_LIB define.
 XCOMM #########################################################################
 XCOMM 
-XA_DLL_DEF = -DXA_DLL -DXA_PRINT
+XA_DLL_DEF = -DXA_PRINT
 XCOMM ### Use this only if the above doesn't work
 XCOMM XA_DLL_DEF = -DXA_DLL
 XCOMM
 XCOMM ### You may need this library.
-XA_DLL_LIB = -ldl
+XCOMM XA_DLL_LIB = -ldl
 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 = ${PREFIX}/lib/xanim
 
 
 
@@ -186,13 +186,29 @@
 XCOMM  
 XCOMM  Again don't use these if you are using the dynamically loadable modules.
 XCOMM 
-XCOMM XA_IV32_DEF = -DXA_IV32 
-XCOMM XA_CVID_DEF = -DXA_CVID
-XCOMM XA_CYUV_DEF = -DXA_CYUV
-XCOMM 
-XCOMM XA_IV32_LIB = mods/xa2.1_iv32_linuxELF.o
-XCOMM XA_CVID_LIB = mods/xa2.0_cvid_linuxELF.o
-XCOMM XA_CYUV_LIB = mods/xa1.0_cyuv_linuxELF.o
+.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "m68k") || (${MACHINE_ARCH} == "sparc")
+XA_IV32_DEF = -DXA_IV32 
+XA_CVID_DEF = -DXA_CVID
+XA_CYUV_DEF = -DXA_CYUV
+.endif
+XCOMM
+.if (${MACHINE_ARCH} == "i386")
+XA_IV32_LIB = mods/xa2.0_iv32_netbsd386.o
+XA_CVID_LIB = mods/xa2.0_cvid_netbsd386.o
+XA_CYUV_LIB = mods/xa1.0_cyuv_netbsd386.o
+.elif (${MACHINE_ARCH} == "m68k")
+XA_IV32_LIB = mods/xa2.0_iv32_netbsd68k.o
+XA_CVID_LIB = mods/xa2.0_cvid_netbsd68k.o
+XA_CYUV_LIB = mods/xa1.0_cyuv_netbsd68k.o
+.elif (${MACHINE_ARCH} == "sparc")
+XA_IV32_LIB = mods/xa2.0_iv32_sparcCOFF.o
+XA_CVID_LIB = mods/xa2.0_cvid_sparcCOFF.o
+XA_CYUV_LIB = mods/xa1.0_cyuv_sparcAOUT.o
+.else
+XA_IV32_DEF =
+XA_CVID_DEF =
+XA_CYUV_DEF =
+.endif
 XCOMM 
 XCOMM ##########################
 XCOMM  NOTE: SGI Machines Only: 
@@ -267,8 +283,8 @@
 XCOMM  XA_AUDIO_DEFS =
 XCOMM 
 XCOMM ## -- Linux PCs ---------------------------------------------------------
-XA_AUDIO_DEFS = -DXA_LINUX_AUDIO
-XA_AUDIO_LIBS = -lc
+XCOMM XA_AUDIO_DEFS = -DXA_LINUX_AUDIO
+XCOMM XA_AUDIO_LIBS = -lc
 XCOMM 
 XCOMM  -- Linux PC's with OLD Rev sound drivers -------------------------------
 XCOMM  XA_AUDIO_DEFS = -DXA_LINUX_AUDIO -DXA_LINUX_OLDER_SND
@@ -307,7 +323,7 @@
 XCOMM  XA_AUDIO_DEFS = -DXA_SONY_AUDIO
 XCOMM 
 XCOMM  -- NetBSD-current (as of 30/April 1995)---------------------------------
-XCOMM  XA_AUDIO_DEFS = -DXA_NetBSD_AUDIO
+XA_AUDIO_DEFS = -DXA_NetBSD_AUDIO
 XCOMM 
 XCOMM  -- QNX 4.2 PC's --------------------------------------------------------
 XCOMM  XA_AUDIO_DEFS = -DXA_LINUX_AUDIO -DXA_SELECT
@@ -465,7 +481,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)