From 9fb5ae6cd80c9d6bdb7621bff7299d401cda20d8 Mon Sep 17 00:00:00 2001
From: Chris Kleeschulte <chrisk@bitpay.com>
Date: Tue, 7 Jul 2015 13:51:11 -0400
Subject: [PATCH] Fixed build script.

---
 bin/build-libbitcoind | 20 ++++++++------------
 platform/os.sh        |  4 ++++
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/bin/build-libbitcoind b/bin/build-libbitcoind
index bfd77219..12991f4e 100755
--- a/bin/build-libbitcoind
+++ b/bin/build-libbitcoind
@@ -60,19 +60,15 @@ $full_options
 echo 'make V=1'
 make V=1 
 
+ext=$($root_dir/platform/os.sh ext)
 echo 'Copying libbitcoind.{so|dylib} to its appropriate location.'
-if test -e "${os_dir}/libbitcoind.so" 
-  mv src/libbitcoind.so "${os_dir}/libbitcoind.so.0.0.0"
-  cd "${os_dir}"
-  rm libbitcoind.so.0
-  rm libbitcoind.so
-  ln -s libbitcoind.so.0.0.0 libbitcoind.so.0
-  ln -s libbitcoind.so.0.0.0 libbitcoind.so
-elif test -e "${os_dir}/libbitcoind.dylib"; then
-  mv src/libbitcoind.dylib "${os_dir}/libbitcoind.0.dylib"
-  cd "${os_dir}"
-  rm libbitcoind.dylib
-  ln -s libbitcoind.0.dylib libbitcoind.dylib
+if test -e "${root_dir}/libbitcoind/src/.libs/libbitcoind.${ext}"; then 
+  if [ "$ext" = "dylib" ]; then
+    cp "${root_dir}/libbitcoind/src/.libs/libbitcoind.0.dylib" "${os_dir}/"
+    cp "${root_dir}/libbitcoind/src/.libs/libbitcoind.dylib" "${os_dir}/"
+  else
+    cp "${root_dir}/libbitcoind/src/.libs/libbitcoind.so*" "${os_dir}/"
+  fi
 fi
 
 echo 'Build finished successfully.'
diff --git a/platform/os.sh b/platform/os.sh
index 9012e209..db8ba123 100755
--- a/platform/os.sh
+++ b/platform/os.sh
@@ -61,6 +61,10 @@ if test x"$1" = x'osdir'; then
   exit 0
 fi
 
+if test -z "$1" -o x"$1" = x'ext'; then
+  echo -n "${ext}"
+fi
+
 if test -z "$1" -o x"$1" = x'thread'; then
   echo -n "${thread}"
 fi