$NetBSD: patch-aa,v 1.5 2000/07/21 19:23:07 wiz Exp $

--- Makefile.orig	Sun Jul  9 22:49:23 2000
+++ Makefile	Fri Jul 21 21:06:35 2000
@@ -11,16 +11,16 @@
 
 #C_ONLY=-DC_ONLY
 
-MACH_TYPES=-DMACH_TYPES=\"types-i386.h\"
+#MACH_TYPES=-DMACH_TYPES=\"types-i386.h\"
 
 #BYTE_ORDER=-DMSB_FIRST
-BYTE_ORDER=-DLSB_FIRST
+#BYTE_ORDER=-DLSB_FIRST
 
 DEBUG=-g
 
 OPTFLAGS=-O2 -fomit-frame-pointer
 
-BASE_CFLAGS=-Wall $(DEBUG) $(OPTFLAGS) $(C_ONLY) $(BYTE_ORDER) $(MACH_TYPES)
+BASE_CFLAGS=-Wall $(DEBUG) $(OPTFLAGS) $(C_ONLY) $(MACH_TYPES)
 BASE_SFLAGS=-Wall $(DEBUG) $(OPTFLAGS)
 
 #
@@ -38,9 +38,9 @@
 #
 ifeq ($(TARGET),Linux_X)
 CONFFLAGS=-DPCE_CD_SUPPORT -DSOUND
-LDFLAGS+=-L/usr/X11R6/lib
-CFLAGS+=-I/usr/X11R6/include
-SFLAGS+=-I/usr/X11R6/include
+LDFLAGS+=-L${X11BASE}/lib -Wl,-R${X11BASE}/lib
+CFLAGS+=-I${X11BASE}/include
+SFLAGS+=${ASM_FLAGS} -I${X11BASE}/include
 SYSTEMSRCS=video_x.c ui_x.c snd_unix.c keyboard_x.c cd_unix.c
 BINFILE=darcnes
 LIBS=-lXext -lXaw -lXmu -lXt -lX11