This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 3ba51e8b34e90a80343aab20e74d3b9569fe25c0
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 b891fdb..6e34431 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -93,6 +93,8 @@ x2goclient (4.0.5.3-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.
 
  -- X2Go Release Manager <git-ad...@x2go.org>  Mon, 19 Sep 2016 09:07:07 +0200
 
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

Reply via email to