From c77c524c07f203bf1e261945237b2c2e05f833ba Mon Sep 17 00:00:00 2001
From: Joseph Lenox <lenox.joseph@gmail.com>
Date: Sun, 2 Apr 2017 14:37:04 -0500
Subject: [PATCH] just used completely different processing if WXDIR is used.

---
 package/linux/make_archive.sh | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/package/linux/make_archive.sh b/package/linux/make_archive.sh
index 9a3cccbcb..88ffdfdef 100755
--- a/package/linux/make_archive.sh
+++ b/package/linux/make_archive.sh
@@ -10,12 +10,7 @@ if [ "$#" -ne 1 ]; then
     echo "Usage: $(basename $0) arch_name"
     exit 1;
 fi
-if [ -z ${WXDIR+x} ]; then
-    libdirs=$(find ./local-lib -iname *.so -exec dirname {} \; | sort -u | paste -sd ";" -)
-else
-    echo "WXDIR => $WXDIR"
-    libdirs=$(find {$WXDIR,./local-lib} -iname *.so -exec dirname {} \; | sort -u | paste -sd ";" -)
-fi
+libdirs=$(find ./local-lib -iname *.so -exec dirname {} \; | sort -u | paste -sd ";" -)
 WD=./$(dirname $0)
 source $(dirname $0)/../common/util.sh
 # Determine if this is a tagged (release) commit.
@@ -74,13 +69,20 @@ cp -fRP $SLIC3R_DIR/local-lib $archivefolder/local-lib
 cp -fRP $SLIC3R_DIR/lib/* $archivefolder/local-lib/lib/perl5/
 
 mkdir $archivefolder/bin
-echo "Symlinking libraries to $archivefolder/bin ..."
-for bundle in $(find $archivefolder/local-lib/lib/perl5 -name '*.so' | grep "Wx") $(find $archivefolder/local-lib/lib/perl5 -name '*.so' -type f | grep "wxWidgets"); do
-    echo "$(LD_LIBRARY_PATH=$libdirs ldd $bundle | grep .so | grep local-lib | awk '{print $3}')"
-    for dylib in $(LD_LIBRARY_PATH=$libdirs ldd $bundle | grep .so | grep local-lib | awk '{print $3}'); do
+echo "Installing libraries to $archivefolder/bin ..."
+if [ -z ${WXDIR+x} ]; then
+    for bundle in $(find $archivefolder/local-lib/lib/perl5 -name '*.so' | grep "Wx") $(find $archivefolder/local-lib/lib/perl5 -name '*.so' -type f | grep "wxWidgets"); do
+        echo "$(LD_LIBRARY_PATH=$libdirs ldd $bundle | grep .so | grep local-lib | awk '{print $3}')"
+        for dylib in $(LD_LIBRARY_PATH=$libdirs ldd $bundle | grep .so | grep local-lib | awk '{print $3}'); do
+            install -v $dylib $archivefolder/bin
+        done
+    done
+else
+    echo "Copying libraries from $WXDIR/lib to $archivefolder/bin"
+    for dylib in $(find $WXDIR/lib -type f | grep "so"); do
         install -v $dylib $archivefolder/bin
     done
-done
+fi
 
 echo "Copying startup script..."
 cp -f $WD/startup_script.sh $archivefolder/$appname