From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 3 Oct 2013 10:34:49 +0000 (+0000)
Subject: Fix install_name_tool calls in OS X "make install".
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/da6f998486f1070e205f2e0a54f22a1b67cb32a4?ds=inline

Fix install_name_tool calls in OS X "make install".

Unfortunately the changes of r74909 (see #15452) don't seem to have been
tested and broke "make install" completely as libraries were not found in the
"bin" directory where the script was looking for them. Fix it to use "lib"
subdirectory as intended.

Closes #15551.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74921 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/configure b/configure
index 7b08f61762..7697a87f25 100755
--- a/configure
+++ b/configure
@@ -29269,7 +29269,7 @@ rm -f core conftest.err conftest.$ac_objext \
             DYLIB_RPATH_POSTLINK="${HOST_PREFIX}install_name_tool -id \$@ \$@"
             cat <<EOF >change-install-names
 #!/bin/sh
-libnames=\`cd \${2} ; ls -1 | grep '\.[0-9][0-9]*\.dylib\$'\`
+libnames=\`cd \${1} ; ls -1 | grep '\.[0-9][0-9]*\.dylib\$'\`
 changes=''
 for dep in \${libnames} ; do
     changes="\${changes} -change \${4}/\${dep} \${3}/\${dep}"
diff --git a/configure.in b/configure.in
index 1dafe20f86..1c30b387e0 100644
--- a/configure.in
+++ b/configure.in
@@ -3787,7 +3787,7 @@ if test "$wxUSE_SHARED" = "yes"; then
             DYLIB_RPATH_POSTLINK="${HOST_PREFIX}install_name_tool -id \$@ \$@"
             cat <<EOF >change-install-names
 #!/bin/sh
-libnames=\`cd \${2} ; ls -1 | grep '\.[[0-9]][[0-9]]*\.dylib\$'\`
+libnames=\`cd \${1} ; ls -1 | grep '\.[[0-9]][[0-9]]*\.dylib\$'\`
 changes=''
 for dep in \${libnames} ; do
     changes="\${changes} -change \${4}/\${dep} \${3}/\${dep}"