From 991e63d368a41cad8e3db8c70a14130d6d793ee4 Mon Sep 17 00:00:00 2001
From: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
Date: Thu, 5 May 2016 15:35:12 -0400
Subject: [PATCH] packaging: provide RINGTONE_DIR in install.sh
OSX client uses ring-project for its packaging.
when running make-ring --install daemon and client install prefixes are
different. This means ringtones are not packaged properly (they are in
daemon folder /share/ring/ringtones).
This variable can help all clients to point out to a specific external
dir containing ringtones. It will be ignored if not used.
Change-Id: Id22a9c9b1c7df3c11b882c05e693198514ab9458
Tuleap: #652
---
scripts/install.sh | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/scripts/install.sh b/scripts/install.sh
index bc5b116b..fe5d3df7 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -78,7 +78,10 @@ cd ${BUILDDIR}
if $global; then
cmake .. -DCMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH -DCMAKE_BUILD_TYPE=Debug $static
else
- cmake .. -DCMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX="${INSTALL}/lrc" -DRING_BUILD_DIR="${DAEMON}/src" $static
+ cmake .. -DCMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH \
+ -DCMAKE_BUILD_TYPE=Debug \
+ -DCMAKE_INSTALL_PREFIX="${INSTALL}/lrc" \
+ -DRING_BUILD_DIR="${DAEMON}/src" $static
fi
make
make_install $global
@@ -89,7 +92,10 @@ cd ${BUILDDIR}
if $global; then
cmake .. -DCMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH $static
else
- cmake .. -DCMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH -DCMAKE_INSTALL_PREFIX="${INSTALL}/${client}" -DLibRingClient_DIR="${INSTALL}/lrc/lib/cmake/LibRingClient" $static
+ cmake .. -DCMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH \
+ -DCMAKE_INSTALL_PREFIX="${INSTALL}/${client}" \
+ -DRINGTONE_DIR="${INSTALL}/daemon/share/ring/ringtones" \
+ -DLibRingClient_DIR="${INSTALL}/lrc/lib/cmake/LibRingClient" $static
fi
make
make_install $global
--
GitLab