Commit dd6d2580 authored by Rich Prohaska's avatar Rich Prohaska

addresses #49

git-svn-id: file:///svn/tokudb@808 c7de825b-a66e-492c-adef-691d508d4ae1
parent 67dc4d5e
...@@ -6,11 +6,10 @@ ...@@ -6,11 +6,10 @@
# For very verbose output do # For very verbose output do
# make VERBOSE=2 # make VERBOSE=2
ifndef BDBDIR ifdef BDBDIR
BDBDIR=/usr
endif
BDB_CPPFLAGS = -I$(BDBDIR)/include BDB_CPPFLAGS = -I$(BDBDIR)/include
BDB_LDFLAGS = -L$(BDBDIR)/lib BDB_LDFLAGS = -L$(BDBDIR)/lib -ldb
endif
ifeq ($(OSX),OSX) ifeq ($(OSX),OSX)
#Note: OSX 10.4 needs DYLD_LIBRARY_PATH. OSX 10.5 claims to support -rpath. #Note: OSX 10.4 needs DYLD_LIBRARY_PATH. OSX 10.5 claims to support -rpath.
...@@ -23,7 +22,9 @@ else ...@@ -23,7 +22,9 @@ else
SETTOKUENV=true SETTOKUENV=true
UNSETTOKUENV=true UNSETTOKUENV=true
LIBEXT=so LIBEXT=so
BDB_LDFLAGS += -L$(BDBDIR)/lib -ldb -Wl,-rpath,$(BDBDIR)/lib ifdef BDBDIR
BDB_LDFLAGS += -Wl,-rpath,$(BDBDIR)/lib -lpthread
endif
TDB_LOADLIBES = -L../ -ldb -Wl,-rpath,.. TDB_LOADLIBES = -L../ -ldb -Wl,-rpath,..
VGRIND=valgrind --quiet --error-exitcode=1 --leak-check=yes VGRIND=valgrind --quiet --error-exitcode=1 --leak-check=yes
endif endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment