git.iko.soy/unity8
on xenial help sign in
move some files to a private lib directory
31aa5c3Didier Roche
CMakeLists.txt+1
compare with xenial
unifiedsplit
@@ -57,6 +57,7 @@ find_package(Qt5DBus)
57include(GNUInstallDirs)
57include(GNUInstallDirs)
58
58
59set(SHELL_APP_DIR ${CMAKE_INSTALL_DATADIR}/unity8)
59set(SHELL_APP_DIR ${CMAKE_INSTALL_DATADIR}/unity8)
60+set(SHELL_PRIVATE_LIBDIR ${CMAKE_INSTALL_LIBDIR}/unity8)
60
61
61configure_file(paths.h.in ${CMAKE_CURRENT_BINARY_DIR}/paths.h @ONLY)
62configure_file(paths.h.in ${CMAKE_CURRENT_BINARY_DIR}/paths.h @ONLY)
62
63
debian/unity8.install+5−5
@@ -13,8 +13,8 @@ usr/share/unity8/Panel
13usr/share/unity8/Shell.qml
13usr/share/unity8/Shell.qml
14usr/share/unity8/SideStage
14usr/share/unity8/SideStage
15usr/share/unity8/graphics
15usr/share/unity8/graphics
16−usr/share/unity8/plugins/HudClient
16+usr/lib/*/unity8/qml/HudClient
17−usr/share/unity8/plugins/LightDM
17+usr/lib/*/unity8/qml/LightDM
18−usr/share/unity8/plugins/Ubuntu
18+usr/lib/*/unity8/qml/Ubuntu
19−usr/share/unity8/plugins/Unity
19+usr/lib/*/unity8/qml/Unity
20−usr/share/unity8/plugins/Utils
20+usr/lib/*/unity8/qml/Utils
plugins/HudClient/CMakeLists.txt+2−2
@@ -41,9 +41,9 @@ file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
41 )
41 )
42
42
43install(TARGETS HudClientQml
43install(TARGETS HudClientQml
44− DESTINATION ${SHELL_APP_DIR}/plugins/HudClient
44+ DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/HudClient
45 )
45 )
46
46
47install(FILES qmldir
47install(FILES qmldir
48− DESTINATION ${SHELL_APP_DIR}/plugins/HudClient
48+ DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/HudClient
49 )
49 )
plugins/LightDM/CMakeLists.txt+2−2
@@ -35,9 +35,9 @@ file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
35 )
35 )
36
36
37install(TARGETS LightDM-qml
37install(TARGETS LightDM-qml
38− DESTINATION ${SHELL_APP_DIR}/plugins/LightDM
38+ DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/LightDM
39 )
39 )
40
40
41install(FILES qmldir
41install(FILES qmldir
42− DESTINATION ${SHELL_APP_DIR}/plugins/LightDM
42+ DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/LightDM
43 )
43 )
plugins/Ubuntu/Gestures/CMakeLists.txt+2−2
@@ -27,9 +27,9 @@ add_custom_target(UbuntuGestureQmlDirFile ALL
27)
27)
28
28
29install(TARGETS UbuntuGestureQml
29install(TARGETS UbuntuGestureQml
30− DESTINATION ${SHELL_APP_DIR}/plugins/Ubuntu/Gestures
30+ DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/Ubuntu/Gestures
31 )
31 )
32
32
33install(FILES qmldir
33install(FILES qmldir
34− DESTINATION ${SHELL_APP_DIR}/plugins/Ubuntu/Gestures
34+ DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/Ubuntu/Gestures
35 )
35 )
plugins/Unity/CMakeLists.txt+2−2
@@ -41,9 +41,9 @@ file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
41 )
41 )
42
42
43install(TARGETS Unity-qml
43install(TARGETS Unity-qml
44− DESTINATION ${SHELL_APP_DIR}/plugins/Unity
44+ DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/Unity
45 )
45 )
46
46
47install(FILES qmldir
47install(FILES qmldir
48− DESTINATION ${SHELL_APP_DIR}/plugins/Unity
48+ DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/Unity
49 )
49 )
plugins/Utils/CMakeLists.txt+2−2
@@ -28,9 +28,9 @@ file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
28 )
28 )
29
29
30install(TARGETS Utils-qml
30install(TARGETS Utils-qml
31− DESTINATION ${SHELL_APP_DIR}/plugins/Utils
31+ DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/Utils
32 )
32 )
33
33
34install(FILES qmldir
34install(FILES qmldir
35− DESTINATION ${SHELL_APP_DIR}/plugins/Utils
35+ DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/Utils
36 )
36 )