--- view/Makefile.orig	Sat May 18 12:02:28 2002
+++ view/Makefile	Sat May 18 12:59:50 2002
@@ -40,7 +40,7 @@
 ## or some other directory, depending on your installation.
 ##
 
-XINCLUDEDIR = .
+XINCLUDEDIR = ${X11BASE}/include
 
 ##
 ## If X isn't in the library path (the case for many MachTen and Linux 
@@ -55,7 +55,7 @@
 ## depending on your installation. 
 ##
 
-LIBX11 = -lX11
+LIBX11 = -lX11 -L${X11BASE}/lib
 
 LIBP2C = ../psys/src/libp2c.a
 
@@ -67,7 +67,7 @@
 ##
 ## on Sun Solaris 2.X, -lsocket -lnsl must be added to OTHERLIBS
 
-OTHERLIBS= -lm  
+OTHERLIBS= -lm -lcompat
 
 ##
 ## (2) IEEE library directory
@@ -114,7 +114,7 @@
 
 CHIPMUNKCC = gcc -O3
 
-CC = $(CHIPMUNKCC) 
+CC ?= $(CHIPMUNKCC) 
 
 ##
 ## (4) Adding appropriate flags
@@ -172,11 +172,11 @@
 
 CHIPMUNKFLAGS = 
   
-CFLAGS= $(CHIPMUNKFLAGS) -I$(LOCINC) -I$(XINCLUDEDIR) -DF_OK=0
+CFLAGS += -I$(LOCINC) -I$(XINCLUDEDIR) -DF_OK=0
 
 LDFLAGS= $(LIBP2C) $(LIBX11) $(OTHERLIBS) 
 MYLDFLAGS= $(LIBP2C)  $(IEEEDIR) $(LIBX11)  $(OTHERLIBS)
-BINDIR= ../bin
+BINDIR = ${PREFIX}/bin
 
 OBJS =			\
 	viewfit.o	\
@@ -244,7 +244,7 @@
 	(chdir mt;	make; chdir ..; chdir tek2430; make; chdir ..; make mtlink)
 
 install: view
-	cp view $(BINDIR)/vc
+	${BSD_INSTALL_PROGRAM} view $(BINDIR)/vc
 
 myinstall: myview
 	cp view ../bin/myview