Index: head/ftp/fastdfs/files/patch-client-Makefile.in =================================================================== --- head/ftp/fastdfs/files/patch-client-Makefile.in (revision 432626) +++ head/ftp/fastdfs/files/patch-client-Makefile.in (revision 432627) @@ -1,38 +1,39 @@ --- client/Makefile.in.orig 2016-08-08 07:17:50 UTC +++ client/Makefile.in @@ -3,10 +3,10 @@ COMPILE = $(CC) $(CFLAGS) ENABLE_STATIC_LIB = $(ENABLE_STATIC_LIB) ENABLE_SHARED_LIB = $(ENABLE_SHARED_LIB) -INC_PATH = -I../common -I../tracker -I/usr/include/fastcommon +-LIB_PATH = $(LIBS) -lfastcommon +INC_PATH = -I../common -I../tracker -I$(LOCALBASE)/include/fastcommon - LIB_PATH = $(LIBS) -lfastcommon ++LIB_PATH = $(LIBS) -L${LOCALBASE}/lib -lfastcommon TARGET_PATH = $(TARGET_PREFIX)/bin -TARGET_LIB = $(TARGET_PREFIX)/lib64 +TARGET_LIB = $(TARGET_PREFIX)/lib TARGET_INC = $(TARGET_PREFIX)/include CONFIG_PATH = $(TARGET_CONF_PATH) @@ -50,7 +50,8 @@ ALL_LIBS = $(STATIC_LIBS) $(SHARED_LIBS) all: $(ALL_OBJS) $(ALL_PRGS) $(ALL_LIBS) libfdfsclient.so: - $(COMPILE) -o $@ $< -shared $(FDFS_SHARED_OBJS) $(LIB_PATH) + $(COMPILE) -o $@ $< -shared $(FDFS_SHARED_OBJS) $(LIB_PATH) \ + -Wl,-soname,libfdfsclient.so libfdfsclient.a: ar cru $@ $< $(FDFS_STATIC_OBJS) .o: @@ -66,9 +67,9 @@ install: mkdir -p $(CONFIG_PATH) mkdir -p $(TARGET_LIB) mkdir -p $(TARGET_PREFIX)/lib - cp -f $(ALL_PRGS) $(TARGET_PATH) - 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 + install -s $(ALL_PRGS) $(TARGET_PATH) + if [ $(ENABLE_STATIC_LIB) -eq 1 ]; then install -s $(STATIC_LIBS) $(TARGET_LIB); install -s $(STATIC_LIBS) $(TARGET_PREFIX)/lib/;fi + if [ $(ENABLE_SHARED_LIB) -eq 1 ]; then install -s $(CLIENT_SHARED_LIBS) $(TARGET_LIB); install -s $(CLIENT_SHARED_LIBS) $(TARGET_PREFIX)/lib/;fi mkdir -p $(TARGET_INC)/fastdfs cp -f $(FDFS_HEADER_FILES) $(TARGET_INC)/fastdfs Index: head/ftp/fastdfs/files/patch-storage-Makefile.in =================================================================== --- head/ftp/fastdfs/files/patch-storage-Makefile.in (revision 432626) +++ head/ftp/fastdfs/files/patch-storage-Makefile.in (revision 432627) @@ -1,20 +1,22 @@ --- storage/Makefile.in.orig 2016-08-08 07:17:50 UTC +++ storage/Makefile.in -@@ -1,7 +1,7 @@ +@@ -1,8 +1,8 @@ .SUFFIXES: .c .o COMPILE = $(CC) $(CFLAGS) -INC_PATH = -I. -Itrunk_mgr -I../common -I../tracker -I../client -Ifdht_client -I/usr/include/fastcommon +-LIB_PATH = $(LIBS) -lfastcommon +INC_PATH = -I. -Itrunk_mgr -I../common -I../tracker -I../client -Ifdht_client -I$(LOCALBASE)/include/fastcommon - LIB_PATH = $(LIBS) -lfastcommon ++LIB_PATH = $(LIBS) -L${LOCALBASE}/lib -lfastcommon TARGET_PATH = $(TARGET_PREFIX)/bin CONFIG_PATH = $(TARGET_CONF_PATH) + @@ -34,7 +34,7 @@ all: $(ALL_OBJS) $(ALL_PRGS) install: mkdir -p $(TARGET_PATH) mkdir -p $(CONFIG_PATH) - cp -f $(ALL_PRGS) $(TARGET_PATH) + install -s $(ALL_PRGS) $(TARGET_PATH) if [ ! -f $(CONFIG_PATH)/storage.conf.sample ]; then cp -f ../conf/storage.conf $(CONFIG_PATH)/storage.conf.sample; fi clean: rm -f $(ALL_OBJS) $(ALL_PRGS) Index: head/ftp/fastdfs/files/patch-tracker-Makefile.in =================================================================== --- head/ftp/fastdfs/files/patch-tracker-Makefile.in (revision 432626) +++ head/ftp/fastdfs/files/patch-tracker-Makefile.in (revision 432627) @@ -1,21 +1,23 @@ --- tracker/Makefile.in.orig 2016-08-08 07:17:50 UTC +++ tracker/Makefile.in -@@ -1,7 +1,7 @@ +@@ -1,8 +1,8 @@ .SUFFIXES: .c .o COMPILE = $(CC) $(CFLAGS) -INC_PATH = -I../common -I/usr/include/fastcommon +-LIB_PATH = $(LIBS) -lfastcommon +INC_PATH = -I../common -I$(LOCALBASE)/include/fastcommon - LIB_PATH = $(LIBS) -lfastcommon ++LIB_PATH = $(LIBS) -L${LOCALBASE}/lib -lfastcommon TARGET_PATH = $(TARGET_PREFIX)/bin CONFIG_PATH = $(TARGET_CONF_PATH) + @@ -26,7 +26,8 @@ all: $(ALL_OBJS) $(ALL_PRGS) install: mkdir -p $(TARGET_PATH) mkdir -p $(CONFIG_PATH) - cp -f $(ALL_PRGS) $(TARGET_PATH) + install -s $(ALL_PRGS) $(TARGET_PATH) if [ ! -f $(CONFIG_PATH)/tracker.conf.sample ]; then cp -f ../conf/tracker.conf $(CONFIG_PATH)/tracker.conf.sample; fi + if [ ! -f $(CONFIG_PATH)/storage_ids.conf.sample ]; then cp -f ../conf/storage_ids.conf $(CONFIG_PATH)/storage_ids.conf.sample; fi clean: rm -f $(ALL_OBJS) $(ALL_PRGS)