This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch bugfix/osx
in repository x2goclient.
commit ab026568d7ef8d1511368e2ebc08134e1dc6161e
Author: Mihai Moldovan <io...@ionic.de>
Date: Wed Aug 26 20:56:29 2015 +0200
macbuild.sh: also install libraries into staging area with intermediate
library path.
Putting everything into a single place is a stupid idea.
---
debian/changelog | 2 ++
macbuild.sh | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e563c6c..0fafe8f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -101,6 +101,8 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
instead of @loader_path. Will need testing.
- macbuild.sh: fix echo call to also show the intermediate lib dir, not
just the library file name. Helps debugging.
+ - macbuild.sh: also install libraries into staging area with intermediate
+ library path. Putting everything into a single place is a stupid idea.
-- X2Go Release Manager <git-ad...@x2go.org> Mon, 19 Sep 2016 09:07:07 +0200
diff --git a/macbuild.sh b/macbuild.sh
index 0a974b6..26f0d7e 100755
--- a/macbuild.sh
+++ b/macbuild.sh
@@ -327,8 +327,8 @@ if [ "${BUNDLE}" = "1" ]; then
dylibbundler \
--fix-file
"${FRAMEWORKS_DIR}/${intermediate_lib_dir}/${cur_binary_name}" \
--bundle-deps \
- --dest-dir "${FRAMEWORKS_DIR}/" \
- --install-path "@executable_path/$(repeat_str
"../" "${nesting_level}")../Frameworks/" \
+ --dest-dir
"${FRAMEWORKS_DIR}/${intermediate_lib_dir}" \
+ --install-path "@executable_path/$(repeat_str
"../" "${nesting_level}")../Frameworks/${intermediate_lib_dir}" \
--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
