--- log/src/Makefile.orig	Wed Nov  5 04:53:39 2003
+++ log/src/Makefile	Tue Dec  9 17:42:37 2003
@@ -45,8 +45,8 @@
 
 CD = cd
 
-LOGLIBDIR = `$(CD) ../../log/lib; pwd`
-LIBDIR = `$(CD) ../../lib; pwd`
+LOGLIBDIR = ${PREFIX}/share/chipmunk
+LIBDIR = ${PREFIX}/share/chipmunk
 
 LOCINC = ../../psys/include
 
@@ -63,9 +63,9 @@
 ## or some other directory, depending on your installation. Use the
 ## first one for OS X.
 
-XINCLUDEDIR = .
+XINCLUDEDIR = ${X11BASE}/include
 
-BINDIR = ../../bin
+BINDIR = ${PREFIX}/bin
 LIBP2C = ../../psys/src/libp2c.a
 
 ##
@@ -81,7 +81,7 @@
 ## depending on your installation. Use the second one for OS X.
 ##
 
-LIBX11 = -lX11
+LIBX11 = -lX11 -L${X11BASE}/lib
 
 ##
 ## (2) Library additions
@@ -91,7 +91,7 @@
 ##
 ## on Sun Solaris 2.X, -lsocket -lnsl must be added to OTHERLIBS
 
-OTHERLIBS= -lm 
+OTHERLIBS= -lm -lcompat
 
 
 ##
@@ -110,7 +110,7 @@
   
 CHIPMUNKCC = gcc -O3
 
-CC = $(CHIPMUNKCC) 
+CC ?= $(CHIPMUNKCC) 
 
 ##
 ## (4) Adding appropriate flags
@@ -148,7 +148,7 @@
 
 CHIPMUNKFLAGS = 
 
-CFLAGS =  $(CHIPMUNKFLAGS) -I$(LOCINC) -I$(XINCLUDEDIR) -DLOGLIB=\"$(LOGLIBDIR)\" -DF_OK=0
+CFLAGS +=  -DBSD -I$(LOCINC) -I$(XINCLUDEDIR) -DLOGLIB=\"$(LOGLIBDIR)\" -DF_OK=0
 
 DIGOBJ = logsim.o logdig.o logsimasm.o logsimed.o diggates.o \
          loghier.o logsimh.o swap.o
@@ -179,22 +179,24 @@
 ##  older operating systems -- if problems arise, use a hard link.
 ##
 
+all:  makeana main
+
 install: all
-	cp log $(BINDIR)/diglog
+	${BSD_INSTALL_PROGRAM} log $(BINDIR)/diglog
 	-rm -f $(BINDIR)/analog
 	-(cd $(BINDIR); ln -s diglog analog)
-	cp loged $(BINDIR)/loged
-	cp fixfet7 $(BINDIR)/fixfet7
+	${BSD_INSTALL_PROGRAM} loged $(BINDIR)/loged
+	${BSD_INSTALL_SCRIPT} fixfet7 $(BINDIR)/fixfet7
+	cp -R ../lib/* $(LOGLIBDIR)
+	chmod -R a=r+X $(LOGLIBDIR)
 
 clean:
 	-rm -f *.o ana/*.o ana/logdef.h log loged
 
-all:  makeana main
-
 main: log loged
 
 makeana:
-	($(CD) ana; make $(MFLAGS) grab all)
+	($(CD) ana; $(MAKE) $(MFLAGS) grab all)
 
 
 LOGOBJ = log.o $(TOOLOBJ) logstuff.o logdef.o