From 094012b4660c90dcab5af44f8bcc3486da83084e Mon Sep 17 00:00:00 2001
From: zhaoanan <zhaoanan@360.cn>
Date: Tue, 22 Dec 2015 22:57:44 +0800
Subject: [PATCH] feature: merge branch centos5.4 to support both 5.4 and 6.2

---
 Makefile                                    |   5 ++++-
 lib/{ => centos5.4/lib}/libglog.so.0        | Bin
 lib/{ => centos5.4/lib}/libsnappy.so.1      | Bin
 lib/{ => centos5.4/lib}/libstdc++.so.6.0.13 | Bin
 4 files changed, 4 insertions(+), 1 deletion(-)
 rename lib/{ => centos5.4/lib}/libglog.so.0 (100%)
 rename lib/{ => centos5.4/lib}/libsnappy.so.1 (100%)
 rename lib/{ => centos5.4/lib}/libstdc++.so.6.0.13 (100%)

diff --git a/Makefile b/Makefile
index 95cbdc5dfe..957032fe6b 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,9 @@ RPATH = /usr/local/pika/lib/
 OSVERSION := $(shell cat /etc/redhat-release | cut -d "." -f 1 | awk '{print $$NF}')
 ifeq ($(OSVERSION), 5)
 	LFLAGS = -Wl,-rpath=$(RPATH)
+	SO_DIR = ./lib/centos5.4/lib
+else
+	SO_DIR = ./lib/centos6.2/lib
 endif
 
 CXX = g++
@@ -52,7 +55,7 @@ all: $(OBJECT)
 	mkdir $(OUTPUT)
 	mkdir $(OUTPUT)/bin
 	cp -r ./conf $(OUTPUT)/
-	cp -r ./lib  $(OUTPUT)/
+	cp -r $(SO_DIR)/  $(OUTPUT)/
 	cp $(OBJECT) $(OUTPUT)/bin/
 	rm -rf $(OBJECT)
 	@echo "Success, go, go, go..."
diff --git a/lib/libglog.so.0 b/lib/centos5.4/lib/libglog.so.0
similarity index 100%
rename from lib/libglog.so.0
rename to lib/centos5.4/lib/libglog.so.0
diff --git a/lib/libsnappy.so.1 b/lib/centos5.4/lib/libsnappy.so.1
similarity index 100%
rename from lib/libsnappy.so.1
rename to lib/centos5.4/lib/libsnappy.so.1
diff --git a/lib/libstdc++.so.6.0.13 b/lib/centos5.4/lib/libstdc++.so.6.0.13
similarity index 100%
rename from lib/libstdc++.so.6.0.13
rename to lib/centos5.4/lib/libstdc++.so.6.0.13