Port to Leopard

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

db-benchmark-test/Makefile

@@ -19,7 +19,7 @@ BDB_CPPFLAGS =
 BDB_LDFLAGS = -ldb
 endif
 TDB_CPPFLAGS = -I../include
-TDB_LDFLAGS = -L../lib -ltokudb -Wl,-rpath=$(PWD)/../lib
+TDB_LDFLAGS = -L../lib -ltokudb -Wl,-rpath,$(PWD)/../lib
 
 TARGET_BDB = db-benchmark-test-bdb
 TARGET_TDB = db-benchmark-test-tokudb

src/Makefile

@@ -13,10 +13,12 @@ CPPFLAGS += -D_GNU_SOURCE -D_THREAD_SAFE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_S
 ifneq ($(OSX),)
 LIBEXT=dylib
 SHARED=-dynamiclib
+RPATHNAME=-install_name @rpath/$(LIBNAME).$(LIBEXT)
 CFLAGS+=-fno-common
 else
 LIBEXT=so
 SHARED=-shared
+RPATHNAME=
 endif
 
 .PHONY: install logformat
@@ -50,7 +52,7 @@ LOCKTREE_BINS  = lock_tree/locktree.o lock_tree/rth.o lock_tree/lth.o $(RANGETRE
 
 
 $(LIBNAME).$(LIBEXT): $(DBBINS) $(LOCKTREE_BINS)
-	cc  $(CPPFLAGS) $^ $(SHARED) -o $@ $(CFLAGS) -lz
+	cc  $(CPPFLAGS) $^ $(SHARED) -o $@ $(CFLAGS) -lz $(RPATHNAME)
 
 $(LIBNAME).a: $(DBBINS) $(LOCKTREE_BINS)
 	$(AR) rv $@ $^