From 4107b184b1e1b3d51833da76461641a9716121ac Mon Sep 17 00:00:00 2001
From: Rich Prohaska <prohaska@tokutek.com>
Date: Mon, 27 Jul 2009 18:44:24 +0000
Subject: [PATCH] link the handlerton to a version controlled libtokudb. merge
 -c 13578 from 2.1.0 to main. [t:1887]

git-svn-id: file:///svn/mysql/tokudb-engine/src@13590 c7de825b-a66e-492c-adef-691d508d4ae1
---
 storage/tokudb/Makefile.tokutek | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/storage/tokudb/Makefile.tokutek b/storage/tokudb/Makefile.tokutek
index d4047d7a7b9..d12039737dd 100644
--- a/storage/tokudb/Makefile.tokutek
+++ b/storage/tokudb/Makefile.tokutek
@@ -8,6 +8,7 @@ DEBUG = 1
 GCOV = 0
 SINGLESO = 1
 SYSTEM = $(shell uname -s | tr [A-Z] [a-z])
+LIBTOKUDB=tokudb
 
 # sources to target
 SRCS = $(wildcard *.cc)
@@ -39,9 +40,9 @@ CXXFLAGS += -g $(OPTFLAGS) $(GCOV_FLAGS) $(MYSQL_CXXFLAGS)
 CXXFLAGS += -fPIC
 LDFLAGS = -fPIC -shared -Wl,-soname -Wl,libtokudb_engine.so
 ifeq ($(SINGLESO),1)
-LIBS = $(TOKUDB)/src/ydb_lib.o $(TOKUDB)/lib/libtokudb.a $(TOKUDB)/lib/libtokuportability.a
+LIBS = $(TOKUDB)/src/ydb_lib.o $(TOKUDB)/lib/lib$(LIBTOKUDB).a $(TOKUDB)/lib/libtokuportability.a
 else
-LIBS = -L$(TOKUDB)/lib -ltokudb -ltokuportability 
+LIBS = -L$(TOKUDB)/lib -l$(LIBTOKUDB) -ltokuportability 
 endif
 LIBS += -lpthread -lz -lm -lc