compile passed in mac OS Darwin

HISTORY

@@ -1,4 +1,7 @@
 
+Version 5.06  2014-11-30
+ * compile passed in mac OS Darwin
+
 Version 5.05  2014-11-22
  * tracker_mem.c log more info
  * remove useless global variable: g_network_tv

common/fdfs_global.c

@@ -23,7 +23,7 @@
 int g_fdfs_connect_timeout = DEFAULT_CONNECT_TIMEOUT;
 int g_fdfs_network_timeout = DEFAULT_NETWORK_TIMEOUT;
 char g_fdfs_base_path[MAX_PATH_SIZE] = {'/', 't', 'm', 'p', '\0'};
-Version g_fdfs_version = {5, 5};
+Version g_fdfs_version = {5, 6};
 bool g_use_connection_pool = false;
 ConnectionPool g_connection_pool;
 int g_connection_pool_max_idle_time = 3600;

make.sh

@@ -74,6 +74,12 @@ else
 fi
 
 LIBS=''
+if [ $OS_BITS -eq 64 ]; then
+  LIBS='-L/usr/lib64'
+else
+  LIBS='-L/usr/lib'
+fi
+
 uname=$(uname)
 if [ "$uname" = "Linux" ]; then
   CFLAGS="$CFLAGS -DOS_LINUX -DIOEVENT_USE_EPOLL"

storage/Makefile.in

@@ -2,7 +2,7 @@
 
 COMPILE = $(CC) $(CFLAGS)
 INC_PATH = -I. -Itrunk_mgr -I../common -I../tracker -I../client -Ifdht_client -I/usr/include/fastcommon
-LIB_PATH = -L/usr/local/lib $(LIBS) -lfastcommon
+LIB_PATH = $(LIBS)  -lfastcommon
 TARGET_PATH = $(TARGET_PREFIX)/bin
 CONFIG_PATH = $(TARGET_CONF_PATH)
 

tracker/Makefile.in

@@ -2,7 +2,7 @@
 
 COMPILE = $(CC) $(CFLAGS)
 INC_PATH = -I../common -I/usr/include/fastcommon
-LIB_PATH = -L/usr/local/lib $(LIBS) -lfastcommon
+LIB_PATH = $(LIBS) -lfastcommon
 TARGET_PATH = $(TARGET_PREFIX)/bin
 CONFIG_PATH = $(TARGET_CONF_PATH)