--- wol/Makefile.orig	Wed Nov  5 20:24:18 2003
+++ wol/Makefile	Tue Dec  9 17:49:36 2003
@@ -40,7 +40,7 @@
 ## first one for OS X.
 ##
 
-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. Use the second one for OS X.
 ##
 
-LIBX11 = -lX11
+LIBX11 = -lX11 -L${X11BASE}/lib
 
 
 
@@ -67,7 +67,7 @@
 ##
 ## on some systems, -ldl must be added to the following line
 
-OTHERLIBS= -lm
+OTHERLIBS= -lm -lcompat
 
 
 ##
@@ -97,11 +97,11 @@
 ##
 
 CHIPMUNKCC = gcc -O3
-CC = $(CHIPMUNKCC) 
+CC ?= $(CHIPMUNKCC) 
 
-LIBDIR = `pwd`/
+LIBDIR = ${PREFIX}/share/chipmunk
 WOLPL = $(LIBDIR)
-BINDIR = ../bin
+BINDIR = ${PREFIX}/bin
 
 
 ##
@@ -158,7 +158,7 @@
 
 CHIPMUNKFLAGS =
 
-CFLAGS= $(CHIPMUNKFLAGS) -I$(LOCINC) -I$(XINCLUDEDIR) -DWOLLIBDIR=\"$(WOLPL)\"
+CFLAGS += -DBSD -DF_OK -I$(LOCINC) -I$(XINCLUDEDIR) -DWOLLIBDIR=\"$(WOLPL)\"
 
 LDFLAGS= $(LIBP2C)  $(LIBX11) $(OTHERLIBS)
 
@@ -201,8 +201,8 @@
   
 
 install: wol 
-	cp wol $(BINDIR)
-	cp fixcify $(BINDIR)
+	${BSD_INSTALL_PROGRAM} wol $(BINDIR)
+	${BSD_INSTALL_SCRIPT} fixcify $(BINDIR)
 
 clean:
 	-rm -f *.o wol