$NetBSD: patch-aa,v 1.4 2001/02/17 22:04:17 veego Exp $

--- Makefile.orig	Mon Feb 12 23:08:59 2001
+++ Makefile	Sat Feb 17 22:47:49 2001
@@ -4,13 +4,14 @@
 
 HAVE_XFREE86 = YES
 
+X11BASE      ?= /usr/X11R6
+
 ifneq ($(X11PREFIX),)                      # NetBSD
-X11BASE      ?= $(X11PREFIX)
+X11BASEINST  ?= $(X11PREFIX)
 else
-X11BASE      ?= /usr/X11R6
+X11BASEINST  ?= $(X11BASE)
 endif
 
-X11BASEINST  ?= $(X11BASE)
 LOCALBASE    ?= /usr/local
 DEBUG        = NO
 OS           = $(shell uname -s)
@@ -24,15 +25,6 @@
 override SHELL             = /bin/sh
 
 #
-# NetBSD stuff
-#
-ifeq ($(OS),NetBSD)
-  override INC            += -I/usr/pkg/include
-  override LIBDIRS        += /usr/pkg/lib
-  override LD_INC         += -lossaudio -lz
-endif
-
-#
 # OpenBSD stuff
 #
 ifeq ($(OS),OpenBSD)
@@ -71,6 +63,15 @@
 endif
 
 override CFLAGS           += $(C_WARN_FLAG) -DX11BASE=\"$(X11BASEINST)\"
+
+#
+# NetBSD stuff
+#
+ifeq ($(OS),NetBSD)
+  override INC            += -I$(LOCALBASE)/include
+  override LIBDIRS        += $(LOCALBASE)/lib
+  override LD_INC         += -lossaudio -lz
+endif
 
 ifeq ($(OS), linux)
 override CFLAGS            = $(CFLAGS) -DOLD_TUNER_IFACE
