diff options
| author | click <click@gonnamakeyou.com> | 2013-04-14 14:35:45 +0200 |
|---|---|---|
| committer | click <click@gonnamakeyou.com> | 2013-04-14 14:35:45 +0200 |
| commit | 7afe928f2a9dfbade05bbb0736ef9c8795a06435 (patch) | |
| tree | 1c9ead28127e2b2dcb20cd5e9c8062880c6bfc1c /src | |
| parent | bf10860a1c237fda0f7dd62297d6a591247ec660 (diff) | |
Core/Buildsystem: Actually follow CONF_DIR path-directive when installing configuration-files on UNIX
Fixes issue #9649
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/authserver/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/server/worldserver/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/server/authserver/CMakeLists.txt b/src/server/authserver/CMakeLists.txt index f7c4b9cb8ca..57ab1ffa4ed 100644 --- a/src/server/authserver/CMakeLists.txt +++ b/src/server/authserver/CMakeLists.txt @@ -98,7 +98,7 @@ endif() if( UNIX ) install(TARGETS authserver DESTINATION bin) - install(FILES authserver.conf.dist DESTINATION etc) + install(FILES authserver.conf.dist DESTINATION ${CONF_DIR}) elseif( WIN32 ) install(TARGETS authserver DESTINATION "${CMAKE_INSTALL_PREFIX}") install(FILES authserver.conf.dist DESTINATION "${CMAKE_INSTALL_PREFIX}") diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt index b7097be8e2a..933d545c899 100644 --- a/src/server/worldserver/CMakeLists.txt +++ b/src/server/worldserver/CMakeLists.txt @@ -197,7 +197,7 @@ endif() if( UNIX ) install(TARGETS worldserver DESTINATION bin) - install(FILES worldserver.conf.dist DESTINATION etc) + install(FILES worldserver.conf.dist DESTINATION ${CONF_DIR}) elseif( WIN32 ) install(TARGETS worldserver DESTINATION "${CMAKE_INSTALL_PREFIX}") install(FILES worldserver.conf.dist DESTINATION "${CMAKE_INSTALL_PREFIX}") |