Skip to content
Snippets Groups Projects
Commit 991e63d3 authored by Alexandre Lision's avatar Alexandre Lision Committed by gerrit2
Browse files

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
parent 5c8b5bd3
No related branches found
No related tags found
No related merge requests found
......@@ -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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment