$NetBSD: patch-aa,v 1.2 2000/08/23 21:27:59 veego Exp $

--- Makefile	Fri Nov  5 01:43:51 1999
+++ Makefile	Wed Aug 23 23:10:41 2000
@@ -3,7 +3,6 @@
 #
 
 HAVE_XFREE86 = YES
-X11BASE      = /usr/X11R6
 DEBUG        = NO
 OS           = $(shell uname -s)
 OS_MAJOR     = $(shell uname -r | cut -f1 -d\.)
@@ -11,8 +10,8 @@
 override CF_VERS           = -DVERS_STR=\"1.02\"
 override VIDEOLIB_DIR      = ./videolib
 override INC               = -I$(X11BASE)/include -I/usr/local/include \
-	                     -I$(VIDEOLIB_DIR) -I.
-override LIBDIRS           = $(X11BASE)/lib /usr/local/lib
+	                     -I$(VIDEOLIB_DIR) -I. -I/usr/pkg/include
+override LIBDIRS           = $(X11BASE)/lib /usr/local/lib /usr/pkg/lib
 override SHELL             = /bin/sh
 
 #
@@ -53,7 +52,7 @@
 override CFLAGS           += -DHAVE_XFREE86
 endif
 
-override CFLAGS           += $(C_WARN_FLAG) -DX11BASE=\"$(X11BASE)\"
+override CFLAGS           += $(C_WARN_FLAG) -DX11BASE=\"$(X11PREFIX)\"
 
 ifeq ($(OS), linux)
 override CFLAGS            = $(CFLAGS) -DOLD_TUNER_IFACE
@@ -74,7 +73,7 @@
   override LDFLAGS        := -g $(LDFLAGS)
 endif
 
-override FXTV_LIBDIR       = $(X11BASE)/lib/X11/fxtv
+override FXTV_LIBDIR       = $(X11PREFIX)/lib/X11/fxtv
 
 override CSRC              = $(wildcard *.c)
 override PIXMAPS           = $(wildcard bitmaps/*.x?m)
@@ -102,11 +101,11 @@
 	mkdir -p $(FXTV_LIBDIR)/bitmaps
 	install -c -m 444 -o root $(PIXMAPS) $(FXTV_LIBDIR)/bitmaps
 	install -c -m 444 -o root README $(FXTV_LIBDIR)
-	mkdir -p $(X11BASE)/lib/X11/app-defaults
-	install -c -m 444 -o root Fxtv $(X11BASE)/lib/X11/app-defaults
-	mkdir -p $(X11BASE)/bin
-	install -c -m 444 -o root fxtv.1 $(X11BASE)/man/man1/fxtv.1
-	install -c -m 555 -o root fxtv $(X11BASE)/bin
+	mkdir -p $(X11PREFIX)/lib/X11/app-defaults
+	install -c -m 444 -o root Fxtv $(X11PREFIX)/lib/X11/app-defaults
+	mkdir -p $(X11PREFIX)/bin
+	install -c -m 444 -o root fxtv.1 $(X11PREFIX)/man/man1/fxtv.1
+	install -c -m 555 -o root fxtv $(X11PREFIX)/bin
 	install -c -m 555 -o root fxtv_cnvt.sh $(FXTV_LIBDIR)
 
 clean: