feature: merge branch centos5.4 to support both 5.4 and 6.2

bill-wangbiao · Dec 22, 2015 · 094012b · 094012b
1 parent 1912ca1
commit 094012b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 1 deletion.
diff --git 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 → lib/centos5.4/lib/libglog.so.0 b/lib/libglog.so.0 → lib/centos5.4/lib/libglog.so.0
diff --git a/lib/libsnappy.so.1 → lib/centos5.4/lib/libsnappy.so.1 b/lib/libsnappy.so.1 → lib/centos5.4/lib/libsnappy.so.1
diff --git a/lib/libstdc++.so.6.0.13 → lib/centos5.4/lib/libstdc++.so.6.0.13 b/lib/libstdc++.so.6.0.13 → lib/centos5.4/lib/libstdc++.so.6.0.13