From a5db557e228ddfc2595e2c3cb36a2e6315b2d113 Mon Sep 17 00:00:00 2001 From: bwrsandman Date: Thu, 9 May 2013 22:32:43 -0400 Subject: [PATCH 1/3] fixed /share to be /usr/share --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9f12b11fd..e07c00869 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -656,7 +656,7 @@ if (NOT WIN32 AND NOT DPKG_PROGRAM AND NOT APPLE) ## Non Debian based Linux building # paths set(BINDIR "${CMAKE_INSTALL_PREFIX}/usr/bin" CACHE PATH "Where to install binaries") - set(DATAROOTDIR "${CMAKE_INSTALL_PREFIX}/share" CACHE PATH "Sets the root of data directories to a non-default location") + set(DATAROOTDIR "${CMAKE_INSTALL_PREFIX}/usr/share" CACHE PATH "Sets the root of data directories to a non-default location") set(DATADIR "${DATAROOTDIR}/openmw" CACHE PATH "Sets the openmw data directories to a non-default location") set(DOCDIR "${DATAROOTDIR}/doc/openmw" CACHE PATH "Sets the doc directory to a non-default location.") set(MANDIR "${DATAROOTDIR}/man" CACHE PATH "Where to install manpages") From 642ac1572142d79f00ed5e014b0636fe18c03a54 Mon Sep 17 00:00:00 2001 From: bwrsandman Date: Thu, 9 May 2013 23:24:46 -0400 Subject: [PATCH 2/3] moved openmw resources to /usr/share/games and added missing files --- CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e07c00869..749e0dbfe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -657,7 +657,7 @@ if (NOT WIN32 AND NOT DPKG_PROGRAM AND NOT APPLE) # paths set(BINDIR "${CMAKE_INSTALL_PREFIX}/usr/bin" CACHE PATH "Where to install binaries") set(DATAROOTDIR "${CMAKE_INSTALL_PREFIX}/usr/share" CACHE PATH "Sets the root of data directories to a non-default location") - set(DATADIR "${DATAROOTDIR}/openmw" CACHE PATH "Sets the openmw data directories to a non-default location") + set(DATADIR "${DATAROOTDIR}/games/openmw" CACHE PATH "Sets the openmw data directories to a non-default location") set(DOCDIR "${DATAROOTDIR}/doc/openmw" CACHE PATH "Sets the doc directory to a non-default location.") set(MANDIR "${DATAROOTDIR}/man" CACHE PATH "Where to install manpages") set(SYSCONFDIR "${CMAKE_INSTALL_PREFIX}/etc/openmw" CACHE PATH "Set config dir") @@ -684,6 +684,10 @@ if (NOT WIN32 AND NOT DPKG_PROGRAM AND NOT APPLE) # Install icon and .desktop INSTALL(FILES "${OpenMW_SOURCE_DIR}/files/launcher/images/openmw.png" DESTINATION "${ICONDIR}") INSTALL(FILES "${OpenMW_BINARY_DIR}/openmw.desktop" DESTINATION "${DATAROOTDIR}/applications") + IF(BUILD_OPENCS) + INSTALL(FILES "${OpenMW_SOURCE_DIR}/files/opencs/opencs.png" DESTINATION "${ICONDIR}") + INSTALL(FILES "${OpenMW_BINARY_DIR}/opencs.desktop" DESTINATION "${DATAROOTDIR}/applications") + ENDIF(BUILD_OPENCS) # Install global configuration files INSTALL(FILES "${OpenMW_BINARY_DIR}/openmw.cfg.install" DESTINATION "${SYSCONFDIR}" RENAME "openmw.cfg" ) From 8cdef343efc81cefbb5eb6f98118860968f7e05e Mon Sep 17 00:00:00 2001 From: bwrsandman Date: Fri, 10 May 2013 05:21:10 -0400 Subject: [PATCH 3/3] take default prefix into account --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 749e0dbfe..2cb520a64 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -655,12 +655,12 @@ endif (APPLE) if (NOT WIN32 AND NOT DPKG_PROGRAM AND NOT APPLE) ## Non Debian based Linux building # paths - set(BINDIR "${CMAKE_INSTALL_PREFIX}/usr/bin" CACHE PATH "Where to install binaries") - set(DATAROOTDIR "${CMAKE_INSTALL_PREFIX}/usr/share" CACHE PATH "Sets the root of data directories to a non-default location") + set(BINDIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Where to install binaries") + set(DATAROOTDIR "${CMAKE_INSTALL_PREFIX}/share" CACHE PATH "Sets the root of data directories to a non-default location") set(DATADIR "${DATAROOTDIR}/games/openmw" CACHE PATH "Sets the openmw data directories to a non-default location") set(DOCDIR "${DATAROOTDIR}/doc/openmw" CACHE PATH "Sets the doc directory to a non-default location.") set(MANDIR "${DATAROOTDIR}/man" CACHE PATH "Where to install manpages") - set(SYSCONFDIR "${CMAKE_INSTALL_PREFIX}/etc/openmw" CACHE PATH "Set config dir") + set(SYSCONFDIR "/etc/openmw" CACHE PATH "Set config dir") set(ICONDIR "${DATAROOTDIR}/pixmaps" CACHE PATH "Set icon dir") # Install binaries