This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch bugfix/osx
in repository x2goclient.
commit 16699249956507e5806d06b5b2b3ed223399a207
Author: Mihai Moldovan <io...@ionic.de>
Date: Thu Jul 30 04:45:40 2015 +0200
macbuild.sh: when actually bundling libraries, use @executable_path instead
of @loader_path.
Will need testing.
---
debian/changelog | 2 ++
macbuild.sh | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 83e9aed..0f7fa1e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -126,6 +126,8 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
- macbuild.sh: check current file name against regex, not a (now) full
path.
- macbuild.sh: add the correct file path to the library bundling array.
+ - macbuild.sh: when actually bundling libraries, use @executable_path
+ instead of @loader_path. Will need testing.
* debian/control:
- Maintainer change in package: X2Go Developers <x2go-...@lists.x2go.org>.
- Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/macbuild.sh b/macbuild.sh
index b15d62a..b3a6203 100755
--- a/macbuild.sh
+++ b/macbuild.sh
@@ -328,7 +328,7 @@ if [ "${BUNDLE}" = "1" ]; then
--fix-file
"${FRAMEWORKS_DIR}/${intermediate_lib_dir}/${cur_binary_name}" \
--bundle-deps \
--dest-dir "${FRAMEWORKS_DIR}/" \
- --install-path "@loader_path/$(repeat_str "../"
"${nesting_level}")Frameworks/" \
+ --install-path "@executable_path/$(repeat_str
"../" "${nesting_level}")../Frameworks/" \
--create-dir \
--overwrite-files
fi
--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email
on /srv/git/code.x2go.org/x2goclient.git
_______________________________________________
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits
