Merge branch 'master' of https://github.com/brpc/brpc into kenshinxf

README.md

@@ -26,7 +26,7 @@ You can use it to:
 # Try it!
 
 * Read [overview](docs/en/overview.md) to know where brpc can be used and its advantages.
-* Read [building steps](docs/cn/getting_started.md) to get started and play with [examples](https://github.com/brpc/brpc/tree/master/example/).
+* Read [getting started](docs/cn/getting_started.md) for building steps and play with [examples](https://github.com/brpc/brpc/tree/master/example/).
 * Docs:
   * [Performance benchmark](docs/cn/benchmark.md)
   * [bvar](docs/en/bvar.md)

config_brpc.sh

@@ -31,11 +31,17 @@ if [ $? != 0 ] ; then >&2 $ECHO "Terminating..."; exit 1 ; fi
 # Note the quotes around `$TEMP': they are essential!
 eval set -- "$TEMP"
 
+if [ "$SYSTEM" = "Darwin" ]; then
+    REALPATH=realpath
+else
+    REALPATH="readlink -f"
+fi
+
 # Convert to abspath always so that generated mk is include-able from everywhere
 while true; do
     case "$1" in
-        --headers ) HDRS_IN="$(realpath $2)"; shift 2 ;;
-        --libs ) LIBS_IN="$(realpath $2)"; shift 2 ;;
+        --headers ) HDRS_IN="$(${REALPATH} $2)"; shift 2 ;;
+        --libs ) LIBS_IN="$(${REALPATH} $2)"; shift 2 ;;
         --cc ) CC=$2; shift 2 ;;
         --cxx ) CXX=$2; shift 2 ;;
         --with-glog ) WITH_GLOG=1; shift 1 ;;

docs/cn/getting_started.md

@@ -25,7 +25,7 @@ $ sudo apt-get install git g++ make libssl-dev
 
 Install [gflags](https://github.com/gflags/gflags), [protobuf](https://github.com/google/protobuf), [leveldb](https://github.com/google/leveldb):
 ```
-$ sudo apt-get install realpath libgflags-dev libprotobuf-dev libprotoc-dev protobuf-compiler libleveldb-dev
+$ sudo apt-get install libgflags-dev libprotobuf-dev libprotoc-dev protobuf-compiler libleveldb-dev
 ```
 
 If you need to statically link leveldb: