revert (parts) of the last two changes, still enforce using relative dirs
This commit is contained in:
parent
fa07b0b582
commit
48274249df
1 changed files with 2 additions and 2 deletions
|
@ -65,7 +65,7 @@ endif(PYTHON_EXECUTABLE AND NOT PYTHON_LIBRARY)
|
|||
set(BINDIR "bin" CACHE STRING "Where to install binaries")
|
||||
set(DATAROOTDIR "${CMAKE_INSTALL_PREFIX}/share" CACHE STRING "Sets the root of data directories to a non-default location")
|
||||
set(DATADIRNAME "wesnoth" CACHE STRING "change the name of the directory for the read-only architecture-independent game data")
|
||||
set(LOCALEDIRNAME "translations" CACHE STRING "change the name of the locale data directory to a non-default name")
|
||||
set(LOCALEDIR "translations" CACHE STRING "change the name of the locale data directory to a non-default name")
|
||||
set(PREFERENCES_DIR "" CACHE STRING "Use a non-default preferences directory (.wesnoth on unix)")
|
||||
set(BINARY_SUFFIX "" CACHE STRING "Suffix behind all binaries")
|
||||
set(BINARY_PREFIX "" CACHE STRING "Prefix in front of all binaries")
|
||||
|
@ -92,7 +92,7 @@ if(NOT WIN32)
|
|||
endif(NOT WIN32)
|
||||
|
||||
add_definitions(-DHAS_RELATIVE_LOCALEDIR)
|
||||
set(LOCALE_INSTALL ${LOCALEDIR})
|
||||
set(LOCALE_INSTALL ${DATADIR}/${LOCALEDIR})
|
||||
|
||||
if(PREFERENCES_DIR)
|
||||
add_definitions(-DPREFERENCES_DIR='\"${PREFERENCES_DIR}\"')
|
||||
|
|
Loading…
Add table
Reference in a new issue