--- config/Make.rules.orig	Sat Aug  5 16:29:46 2006
+++ config/Make.rules	Sat Aug  5 16:29:51 2006
@@ -166,9 +166,9 @@
 BZIP2_LIBS              = $(if $(BZIP2_HOME),-L$(BZIP2_HOME)/$(libsubdir)) -lbz2
 BZIP2_RPATH_LINK        = $(if $(BZIP2_HOME),$(call rpathlink,$(BZIP2_HOME)/$(libsubdir)))
 
-DB_FLAGS                = $(if $(DB_HOME),-I$(DB_HOME)/include)
-DB_LIBS                 = $(if $(DB_HOME),-L$(DB_HOME)/$(libsubdir)) -ldb_cxx
-DB_RPATH_LINK           = $(if $(DB_HOME),$(call rpathlink,$(DB_HOME)/$(libsubdir)))
+DB_FLAGS                = -I%%BDB_INCLUDE_DIR%%
+DB_LIBS                 = -L%%BDB_LIB_DIR%% -l%%BDB_LIB_CXX_NAME%%
+DB_RPATH_LINK           = $(call rpathlink,%%BDB_LIB_DIR%%)
 
 EXPAT_FLAGS             = $(if $(EXPAT_HOME),-I$(EXPAT_HOME)/include)
 EXPAT_LIBS              = $(if $(EXPAT_HOME),-L$(EXPAT_HOME)/$(libsubdir)) -lexpat