mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-21 06:53:53 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'swick/master'

Browse source
This commit is contained in:
Marc Zinnschlag 2014-09-19 16:01:22 +02:00
commit 727a83d09a
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CMakeLists.txt
View file

@ -401,7 +401,11 @@ IF(NOT WIN32 AND NOT APPLE)
SET(DATADIR "${DATAROOTDIR}/games/openmw" CACHE PATH "Sets the openmw data directories to a non-default location")
SET(ICONDIR "${DATAROOTDIR}/pixmaps" CACHE PATH "Set icon dir")
SET(LICDIR "${DATAROOTDIR}/licenses/openmw" CACHE PATH "Sets the openmw license directory to a non-default location.")
SET(SYSCONFDIR "/etc/openmw" CACHE PATH "Set config dir")
IF("${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr")
SET(SYSCONFDIR "/etc/openmw" CACHE PATH "Set config dir")
ELSE()
SET(SYSCONFDIR "${CMAKE_INSTALL_PREFIX}/etc/openmw" CACHE PATH "Set config dir")
ENDIF()
# Install binaries
INSTALL(PROGRAMS "${OpenMW_BINARY_DIR}/openmw" DESTINATION "${BINDIR}" )

1
components/CMakeLists.txt
View file

@ -57,6 +57,7 @@ add_component_dir (misc
utf8stream stringops resourcehelpers
)
add_definitions(-DINSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}")
add_component_dir (files
linuxpath androidpath windowspath macospath fixedpath multidircollection collections configurationmanager
constrainedfiledatastream lowlevelfile

4
components/files/linuxpath.cpp
View file

@ -69,7 +69,7 @@ boost::filesystem::path LinuxPath::getCachePath() const
boost::filesystem::path LinuxPath::getGlobalConfigPath() const
{
boost::filesystem::path globalPath("/etc/");
boost::filesystem::path globalPath(INSTALL_PREFIX "/etc/");
return globalPath / mName;
}
@ -80,7 +80,7 @@ boost::filesystem::path LinuxPath::getLocalPath() const
boost::filesystem::path LinuxPath::getGlobalDataPath() const
{
boost::filesystem::path globalDataPath("/usr/share/games/");
boost::filesystem::path globalDataPath(INSTALL_PREFIX "/share/games/");
return globalDataPath / mName;
}