--- makefile.orig	Sat Jan 13 01:22:03 2007
+++ makefile	Mon Mar 26 09:16:22 2007
@@ -32,8 +32,8 @@
 THRLIBS=
 SUFF=
 else
-TFLAGS=-pthread
-THRLIBS=-pthread
+TFLAGS=-D_REENTRANT ${PTHREAD_CFLAGS}
+THRLIBS=${PTHREAD_LIBS}
 SUFF=_r
 endif
 
@@ -62,21 +62,22 @@
 
 WEB_EXAMPLES = cgistub bugdb clidb
 
-CC = g++
+CC = ${CXX}
 
 # DEFS macro is deprecatred, edit config.h file instead
 DEFS = 
 
 #CFLAGS = $(TFLAGS) -Iinc -c -Wall -O5 -g  -fPIC $(DEFS) 
-CFLAGS = -c -Iinc -Wall -O0 -g -fPIC $(DEFS) $(TFLAGS)
+CFLAGS = -c -Iinc ${CXXFLAGS} -fPIC $(DEFS) $(TFLAGS)
 #CFLAGS = -c -Iinc -Wall -O0 -fPIC -DFASTDB_DEBUG=DEBUG_TRACE -g $(DEFS) $(TFLAGS)
 
 #SHFLAGS=-shared -Wl,-soname,$@
-SHFLAGS=-shared
+SHFLAGS=-shared -Wl,-soname,$@
+#SHFLAGS=-shared
 
 
 LD = $(CC)
-LDFLAGS = -g $(TFLAGS)
+LDFLAGS = $(TFLAGS)
 
 AR = ar
 ARFLAGS = -cru
@@ -386,24 +387,20 @@
 
 install: subsql cleanupsem installlib
 	mkdir -p $(BINSPATH)
-	cp subsql $(BINSPATH)
-	strip $(BINSPATH)/subsql
-	cp cleanupsem $(BINSPATH)
-	strip $(BINSPATH)/cleanupsem
+	${BSD_INSTALL_PROGRAM} subsql $(BINSPATH)
+	${BSD_INSTALL_PROGRAM} cleanupsem $(BINSPATH)
 
 installlib: $(FASTDB_LIB) $(CLI_LIB) $(FASTDB_SHARED) $(CLI_SHARED)
 	mkdir -p $(INCSPATH)
-	cp $(INCS) $(INCSPATH)
+	${BSD_INSTALL_DATA} $(INCS) $(INCSPATH)
 	mkdir -p $(LIBSPATH)
-	cp $(FASTDB_LIB) $(CLI_LIB) $(FASTDB_SHARED) $(CLI_SHARED) $(LIBSPATH)
+	${BSD_INSTALL_PROGRAM} $(FASTDB_LIB) $(CLI_LIB) $(FASTDB_SHARED) $(CLI_SHARED) $(LIBSPATH)
 	(cd $(LIBSPATH) && ln -f -s $(FASTDB_SHARED) libfastdb$(SUFF).so \
 	 && ln -f -s $(CLI_SHARED) libcli$(SUFF).so)
-	if [ -f $(JNI_LIB) ]; then cp $(JNI_LIB) $(LIBSPATH); \
-	  cd $(LIBSPATH) && ln -f -s $(JNI_LIB) libjnicli.so; fi
 
 uninstall:
 	rm -fr $(INCSPATH)
-	cd $(LIBSPATH); rm -f $(FASTDB_LIB) $(CLI_LIB) $(FASTDB_SHARED) $(CLI_SHARED) $(JNI_LIB) libfastdb$(SUFF).so libjnicli.so libcli$(SUFF).so
+	cd $(LIBSPATH); rm -f $(FASTDB_LIB) $(CLI_LIB) $(FASTDB_SHARED) $(CLI_SHARED) libfastdb$(SUFF).so libcli$(SUFF).so
 	rm $(BINSPATH)/subsql
 
 cleanobj: