From 6a461812c648780c7f7af5043abb9b1c2344d5c7 Mon Sep 17 00:00:00 2001
From: Yu Yang <yuyang18@baidu.com>
Date: Thu, 15 Dec 2016 17:36:57 +0800
Subject: [PATCH] Install protobuf3 to /usr

---
 paddle/scripts/travis/before_install.linux.sh | 2 +-
 paddle/scripts/travis/main.sh                 | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/paddle/scripts/travis/before_install.linux.sh b/paddle/scripts/travis/before_install.linux.sh
index c23acfb60e8..9620bff6bcf 100755
--- a/paddle/scripts/travis/before_install.linux.sh
+++ b/paddle/scripts/travis/before_install.linux.sh
@@ -6,7 +6,7 @@ wget https://github.com/google/protobuf/archive/v3.0.2.tar.gz -O protobuf.tar.gz
 tar xf protobuf.tar.gz
 cd protobuf*
 ./autogen.sh
-./configure
+./configure --prefix=/usr/
 make -j 2 install
 cd ..
 rm -rf protobuf*
diff --git a/paddle/scripts/travis/main.sh b/paddle/scripts/travis/main.sh
index 1b49a12563d..13f2552d29d 100755
--- a/paddle/scripts/travis/main.sh
+++ b/paddle/scripts/travis/main.sh
@@ -1,11 +1,6 @@
 #!/bin/bash
 cd `dirname $0`
 
-if [ "$TRAVIS_OS_NAME" == "linux" ]; then
-  # for manually installed protobuf 3.10
-  export LD_LIBRARY_PATH=/usr/local/lib/:$LD_LIBRARY_PATH
-fi
-
 if [ ${JOB} == "BUILD_AND_TEST" ]; then
   ./build_and_test.sh
 elif [ ${JOB} == "DOCS" ]; then
-- 
GitLab