1) modify Makefile to copy tools to output accroding to releases;

2) rename directory lib/centos*;
XEdwin · Jan 4, 2016 · 213bb91 · 213bb91
1 parent 39dd1af
commit 213bb91
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -4,9 +4,11 @@ LFLAGS = -Wl,-rpath=$(RPATH)
 
 OSVERSION := $(shell cat /etc/redhat-release | cut -d "." -f 1 | awk '{print $$NF}')
 ifeq ($(OSVERSION), 5)
-	SO_DIR = ./lib/centos5.4/lib
+	SO_DIR = ./lib/5.4
+	TOOLS_DIR = ./tools/5.4
 else
-	SO_DIR = ./lib/centos6.2/lib
+	SO_DIR = ./lib/6.2
+	TOOLS_DIR = ./tools/6.2
 endif
 
 CXX = g++
@@ -15,7 +17,6 @@ OBJECT = pika
 SRC_DIR = ./src
 THIRD_PATH = ./third
 OUTPUT = ./output
-TOOLS_DIR = ./tools
 
 
 INCLUDE_PATH = -I./include/ \
@@ -57,9 +58,11 @@ all: $(OBJECT)
 	mkdir $(OUTPUT)
 	mkdir $(OUTPUT)/bin
 	cp -r ./conf $(OUTPUT)/
-	cp -r $(SO_DIR)/  $(OUTPUT)/
+	mkdir $(OUTPUT)/lib
+	cp -r $(SO_DIR)/*  $(OUTPUT)/lib
 	cp $(OBJECT) $(OUTPUT)/bin/
-	cp -r $(TOOLS_DIR)/* $(OUTPUT)/bin/
+	mkdir $(OUTPUT)/tools
+	cp -r $(TOOLS_DIR)/* $(OUTPUT)/tools/
 	rm -rf $(OBJECT)
 	@echo "Success, go, go, go..."
 

diff --git a/lib/centos5.4/lib/libglog.so.0 → lib/5.4/libglog.so.0 b/lib/centos5.4/lib/libglog.so.0 → lib/5.4/libglog.so.0
diff --git a/lib/centos5.4/lib/libsnappy.so.1 → lib/5.4/libsnappy.so.1 b/lib/centos5.4/lib/libsnappy.so.1 → lib/5.4/libsnappy.so.1
diff --git a/lib/centos5.4/lib/libstdc++.so.6.0.13 → lib/5.4/libstdc++.so.6.0.13 b/lib/centos5.4/lib/libstdc++.so.6.0.13 → lib/5.4/libstdc++.so.6.0.13
diff --git a/lib/centos6.2/lib/libglog.so.0 → lib/6.2/libglog.so.0 b/lib/centos6.2/lib/libglog.so.0 → lib/6.2/libglog.so.0
diff --git a/lib/centos6.2/lib/libsnappy.so.1 → lib/6.2/libsnappy.so.1 b/lib/centos6.2/lib/libsnappy.so.1 → lib/6.2/libsnappy.so.1