--- src/Makefile	27 Jul 2003 07:49:43 -0000
+++ src/Makefile	27 Jul 2003 08:24:47 -0000
@@ -3,11 +3,11 @@
 SCRIPTS = $(ASSSHOME)/scripts
 
 # change this to the directory of your bdb 4.x install
-DB_HOME = /opt/db-4.0.14
+DB_HOME = /usr/local
 DB_INC = $(DB_HOME)/include
 DB_LIB = $(DB_HOME)/lib
 DB_CFLAGS = -I$(DB_INC)
-DB_LDFLAGS = -L$(DB_LIB) -Wl,-rpath,$(DB_LIB) -ldb-4
+DB_LDFLAGS = -L$(DB_LIB) -Wl,-rpath,$(DB_LIB) -ldb4
 
 # change this to the directory of your mysql install
 MYSQL_HOME = /opt/mysql
@@ -17,14 +17,14 @@
 MYSQL_LDFLAGS = -L$(MYSQL_LIB) -Wl,-rpath,$(MYSQL_LIB) -lmysqlclient_r
 
 # change this to the location of your python 2.2+ install
-PYTHON_HOME = /opt/python-2.2.2
+PYTHON_HOME = /usr/local
 PYTHON_INC = $(PYTHON_HOME)/include/python2.2
 PYTHON_LIB = $(PYTHON_HOME)/lib/python2.2
 PYTHON_CFLAGS = -I$(PYTHON_INC)
 PYTHON_LDFLAGS = -L$(PYTHON_LIB)/config -lpython2.2 -lutil -lm
 
 
-LDFLAGS = -fPIC $(PROF_FLAGS)
+LDFLAGS = -pthread -fPIC $(PROF_FLAGS)
 #PROF_FLAGS = -pg
 
 #OPT_CFLAGS = -O2 -fomit-frame-pointer -Wall -fpedantic -DNDEBUG
@@ -44,7 +44,6 @@
             external.so  \
             scoring.so   \
             admin.so     \
-            database.so  \
             turf.so      \
             pymod.so     \
             funky.so
@@ -55,7 +54,7 @@
 all: $(ALL_STUFF) install
 
 asss: main.o app.o module.o cmod.o util.o pathutil.o protutil.o region.o rwlock.o
-	$(CC) $(LDFLAGS) -rdynamic -o $@ $^ -ldl -lpthread
+	$(CC) $(LDFLAGS) -rdynamic -o $@ $^
 
 dbtool: dbtool.o statcodes.o util.c
 	$(CC) $(LDFLAGS) -DNOMPQUEUE -o $@ $^ $(DB_LDFLAGS)
--- src/dbtool.c	6 Jul 2003 08:54:06 -0000
+++ src/dbtool.c	27 Jul 2003 08:24:47 -0000
@@ -17,7 +17,7 @@
 #include <direct.h>
 #endif
 
-#include "db.h"
+#include "db4/db.h"
 
 #include "defs.h"
 
--- src/persist.c	27 Jul 2003 07:49:43 -0000
+++ src/persist.c	27 Jul 2003 08:24:47 -0000
@@ -15,7 +15,7 @@
 #include <direct.h>
 #endif
 
-#include "db.h"
+#include "db4/db.h"
 
 #ifdef DB_VERSION_MAJOR
 #if DB_VERSION_MAJOR < 4
