$NetBSD: patch-aa,v 1.26 2001/03/24 19:52:34 kristerw Exp $
--- makefile.unix.orig	Sat Mar 17 03:11:28 2001
+++ makefile.unix	Fri Mar 23 19:25:28 2001
@@ -168,7 +168,7 @@
 # *** xmameroot, this is the default rompath, place where the highscores are
 # stored, global rc location etc. Since most of these are configurable through
 # the rc-file anyway, there are no longer seperate defines for each.
-XMAMEROOT = $(PREFIX)/lib/x$(TARGET)
+XMAMEROOT = $(PREFIX)/share/xmame
 
 
 ##############################################################################
@@ -176,7 +176,7 @@
 ##############################################################################
 
 ### i386 + gnu-asm
-MY_CPU = i386
+MY_CPU = ${MAME_CPU}
 ### i386 no asm
 # MY_CPU = i386_noasm
 ### ia64
@@ -197,11 +197,11 @@
 ##############################################################################
 
 ### Linux 
-ARCH  = linux
+# ARCH  = linux
 ### FreeBSD
 # ARCH  = freebsd
 ### NetBSD
-# ARCH  = netbsd
+ARCH  = netbsd
 ### OpenBSD
 # ARCH = openbsd
 ### Solaris / SunOS
@@ -234,11 +234,13 @@
 # X Input Extensions based joystick, this is known to not work right now ;|
 # JOY_X11 = 1
 # On iX86 based OS's, if supported, you can use standard joystick driver.
-# JOY_I386 = 1
+ifeq (${NETBSD_JOYSTICK},yes)
+JOY_I386 = 1
+endif
 # Linux FM-TOWNS game PAD joystick emulation support, thanks to Osamu Kurati.
 # JOY_PAD = 1
 # NetBSD/FreeBSD USB joystick support.
-# JOY_USB = 1
+JOY_USB = 1
 
 
 ##############################################################################
@@ -284,7 +286,9 @@
 # MIT-Shared Memory X Extensions, comment the
 X11_MITSHM = 1
 # XFree86 DGA
-# X11_DGA = 1
+ifeq (${NETBSD_DGA},yes)
+X11_DGA = 1
+endif
 # The XIL library (Solaris 2.5.1 and higher), uncomment
 # X11_XIL = 1
 
@@ -293,8 +297,8 @@
 # X11INC		= -I/usr/include/X11
 # X11LIB		= -L/usr/lib/X11
 # standard location for XFree86
-X11INC		= -I/usr/X11R6/include
-X11LIB		= -L/usr/X11R6/lib
+X11INC		= -I${PREFIX}/include
+X11LIB		= -L${PREFIX}/lib -Wl,-R${PREFIX}/lib
 # for Sun systems
 # X11INC		= -I/usr/openwin/include
 # X11LIB		= -L/usr/openwin/lib