From 9c66431bd5c993f3ec97db1630a922c5919cf116 Mon Sep 17 00:00:00 2001 From: Yu Qing Date: Sat, 10 Oct 2015 17:55:20 +0800 Subject: [PATCH] install library to $(TARGET_PREFIX)/lib anyway --- HISTORY | 3 +++ client/Makefile.in | 4 ++-- common/fdfs_global.c | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/HISTORY b/HISTORY index 97af527..8370e10 100644 --- a/HISTORY +++ b/HISTORY @@ -1,4 +1,7 @@ +Version 5.08 2015-10-10 + * install library to $(TARGET_PREFIX)/lib anyway + Version 5.07 2015-09-13 * schedule task add the "second" field * make.sh changed, you must upgrade libfastcommon to V1.21 or later diff --git a/client/Makefile.in b/client/Makefile.in index 84a618c..295d521 100644 --- a/client/Makefile.in +++ b/client/Makefile.in @@ -66,8 +66,8 @@ install: mkdir -p $(CONFIG_PATH) mkdir -p $(TARGET_LIB) cp -f $(ALL_PRGS) $(TARGET_PATH) - if [ $(ENABLE_STATIC_LIB) -eq 1 ]; then cp -f $(STATIC_LIBS) $(TARGET_LIB); fi - if [ $(ENABLE_SHARED_LIB) -eq 1 ]; then cp -f $(CLIENT_SHARED_LIBS) $(TARGET_LIB); fi + if [ $(ENABLE_STATIC_LIB) -eq 1 ]; then cp -f $(STATIC_LIBS) $(TARGET_LIB); cp -f $(STATIC_LIBS) $(TARGET_PREFIX)/lib;fi + if [ $(ENABLE_SHARED_LIB) -eq 1 ]; then cp -f $(CLIENT_SHARED_LIBS) $(TARGET_LIB); cp -f $(CLIENT_SHARED_LIBS) $(TARGET_PREFIX)/lib;fi mkdir -p $(TARGET_INC)/fastdfs cp -f $(FDFS_HEADER_FILES) $(TARGET_INC)/fastdfs diff --git a/common/fdfs_global.c b/common/fdfs_global.c index 69bcf62..76b2775 100644 --- a/common/fdfs_global.c +++ b/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, 7}; +Version g_fdfs_version = {5, 8}; bool g_use_connection_pool = false; ConnectionPool g_connection_pool; int g_connection_pool_max_idle_time = 3600;