aboutsummaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2015-07-12 20:57:49 -0700
committerGuy Harris <guy@alum.mit.edu>2015-07-13 03:58:17 +0000
commita9d4f20daf7fa45608f6b8d7863618dc8d78a987 (patch)
tree966706fa6a15bfe6b9d91c7c6e5a729e7ccc381b /packaging
parent7cf25a5c1fdd3d56d4e933d9bc5973da041ab478 (diff)
Remove unintended removal of a / in a pathname.
Change-Id: Ibc951e418c497e915e4391258677366a077e5531 Reviewed-on: https://code.wireshark.org/review/9616 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'packaging')
-rwxr-xr-xpackaging/macosx/osx-app.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh
index 52ca477316..e0658155e1 100755
--- a/packaging/macosx/osx-app.sh
+++ b/packaging/macosx/osx-app.sh
@@ -497,7 +497,7 @@ while $endl; do
for lib in $libs
do
if [ ! -d "$pkglib/$lib" ] ; then
- libfrompath=`echo "$lib" | sed -e "s;@rpath/Qt\([a-zA-Z0-9_]*\)\.framework/;$qt_frameworks_dir/Qt\1.framework;" -e "s;$qt_frameworks_dir/Qt\([a-zA-Z0-9_]*\)\.framework/.*;$qt_frameworks_dir/Qt\1.framework;"`
+ libfrompath=`echo "$lib" | sed -e "s;@rpath/Qt\([a-zA-Z0-9_]*\)\.framework/;$qt_frameworks_dir/Qt\1.framework/;" -e "s;$qt_frameworks_dir/Qt\([a-zA-Z0-9_]*\)\.framework/.*;$qt_frameworks_dir/Qt\1.framework;"`
libbinarypath=`echo "$lib" | sed "s;@rpath/Qt\([a-zA-Z0-9_]*\)\.framework/.*;$pkglib/Qt\1.framework/Versions/*/Qt\1;p"`
echo "$libfrompath -> $pkglib"
cp -nR $libfrompath "$pkglib"