remove the .. rpath addresses #49

git-svn-id: file:///svn/tokudb@838 c7de825b-a66e-492c-adef-691d508d4ae1

db-benchmark-test/Makefile

 # standard build: make
-# build with Berkeley DB 4.1: make BDB=/usr/local/BerkeleyDB.4.1
-# build with TokuDB: make BDB=~/svn/tokudb
+# build with Berkeley DB 4.1: make BDBDIR=/usr/local/BerkeleyDB.4.1
+# build with TokuDB: make BDBDIR=~/svn/tokudb
 
 BENCHDBS = bench.bdb/ bench.tokudb
 
+OPTFLAGS = -O2
 CFLAGS = -Wall -Werror -g
 # CFLAGS += -pg
-CFLAGS += -O2 
+CFLAGS += $(OPTFLAGS)
 
-ifdef BDB
-CPPFLAGS = -I$(BDB)/include
-LDFLAGS = -L$(BDB)/lib -ldb -lpthread -Wl,-rpath,$(BDB)/lib
+ifdef BDBDIR
+BDB_CPPFLAGS = -I$(BDBDIR)/include
+BDB_LDFLAGS = -L$(BDBDIR)/lib -ldb -lpthread -Wl,-rpath,$(BDBDIR)/lib
 else
-CPPFLAGS =
-LDFLAGS = -ldb
+BDB_CPPFLAGS =
+BDB_LDFLAGS = -ldb
 endif
 
 TARGETS = db-benchmark-test-bdb db-benchmark-test-tokudb
@@ -24,6 +25,6 @@ clean:
 	rm -rf $(TARGETS) $(BENCHDBS)
 
 db-benchmark-test-tokudb: db-benchmark-test.c
-	cc -Wall -Werror -g -O2  -I../include -L../lib -ldb -Wl,-rpath,../lib  $<  -o $@ -DDIRSUF=tokudb
+	cc $(CFLAGS) -I../include -L../lib -ldb -Wl,-rpath,$(PWD)/../lib $< -o $@ -DDIRSUF=tokudb
 db-benchmark-test-bdb: db-benchmark-test.c
-	cc -Wall -Werror -g -O2                        -ldb                    $<  -o $@ -DDIRSUF=bdb
+	cc $(CFLAGS) $(BDB_CPPFLAGS) $(BDB_LDFLAGS)                      $< -o $@ -DDIRSUF=bdb