diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -170,17 +170,17 @@ set(plugin_dir "${CMAKE_INSTALL_PREFIX}/assets/plugins") set(data_dir "${CMAKE_INSTALL_PREFIX}/assets/data") else() # Linux / bsd etc... - set(data_dir ${CMAKE_INSTALL_PREFIX}/share/marble/data) + set(data_dir ${CMAKE_INSTALL_FULL_DATAROOTDIR}/marble/data) set(plugin_dir ${CMAKE_INSTALL_FULL_LIBDIR}/marble/plugins) - set(CMAKE_MODULES_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/share/marble/cmake) + set(CMAKE_MODULES_INSTALL_PATH ${CMAKE_INSTALL_FULL_DATAROOTDIR}/marble/cmake) endif() if(NOT ICON_INSTALL_DIR) - set(ICON_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/icons) + set(ICON_INSTALL_DIR ${CMAKE_INSTALL_FULL_DATAROOTDIR}/icons) endif(NOT ICON_INSTALL_DIR) if(NOT APPS_INSTALL_DIR) - set(APPS_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/applications) + set(APPS_INSTALL_DIR ${CMAKE_INSTALL_FULL_DATAROOTDIR}/applications) endif(NOT APPS_INSTALL_DIR) if (NOT MARBLE_DATA_PATH) @@ -298,7 +298,7 @@ #################################################### # Install extra files install(FILES LICENSE.txt DESTINATION ${MARBLE_DATA_INSTALL_PATH}) -install(FILES marble.appdata.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/appdata/) +install(FILES marble.appdata.xml DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/appdata/) #################################################### # Install CMake module diff --git a/examples/cpp/CMakeLists.txt b/examples/cpp/CMakeLists.txt --- a/examples/cpp/CMakeLists.txt +++ b/examples/cpp/CMakeLists.txt @@ -2,7 +2,7 @@ # and change #include statements to use and "..." includes only include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../src/lib) -set( MARBLE_EXAMPLES_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/apps/marble/examples ) +set( MARBLE_EXAMPLES_INSTALL_DIR ${CMAKE_INSTALL_FULL_DATAROOTDIR}/apps/marble/examples ) add_subdirectory( hello-marble ) add_subdirectory( map-properties )