[X2Go-Commits] [x2goclient] 55/139: macbuild.sh: also install libraries into staging area with intermediate library path.
git-admin at x2go.org
git-admin at x2go.org
Wed Jan 13 17:27:35 CET 2016
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch bugfix/osx
in repository x2goclient.
commit ba07051edb8f7e137445bc07353462ba0d0a1d68
Author: Mihai Moldovan <ionic at 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 0878fac..53e12a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -109,6 +109,8 @@ x2goclient (4.0.5.1-0x2go1) UNRELEASED; urgency=low
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.
* debian/control:
- Change apache2-dev | libc6-dev build dependency back to apache2-dev
only. Otherwise, apache2-dev is not installed at all, even though
diff --git a/macbuild.sh b/macbuild.sh
index 176c864..2303508 100755
--- a/macbuild.sh
+++ b/macbuild.sh
@@ -312,8 +312,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
More information about the x2go-commits
mailing list