From 8ab293a6ece2110066a2b7998cc70c80a8671e59 Mon Sep 17 00:00:00 2001 From: kervala Date: Sat, 22 Sep 2012 23:42:40 +0200 Subject: [PATCH] Changed: #1493 Fixed some directories --- code/nel/samples/3d/cluster_viewer/CMakeLists.txt | 2 +- code/nel/tools/3d/object_viewer_qt/CMakeLists.txt | 2 +- .../login_system/nel_launcher_windows_ext2/CMakeLists.txt | 2 +- code/ryzom/tools/leveldesign/georges_editor_qt/CMakeLists.txt | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/nel/samples/3d/cluster_viewer/CMakeLists.txt b/code/nel/samples/3d/cluster_viewer/CMakeLists.txt index a68bf0d84..3acb450c5 100644 --- a/code/nel/samples/3d/cluster_viewer/CMakeLists.txt +++ b/code/nel/samples/3d/cluster_viewer/CMakeLists.txt @@ -23,7 +23,7 @@ INSTALL(DIRECTORY fonts/ PATTERN ".svn" EXCLUDE PATTERN "Makefile*" EXCLUDE) INSTALL(DIRECTORY max/ - DESTINATION ${NL_SHARE_PREFIX}/nel/nl_sample_clusterview/max + DESTINATION ${NL_SHARE_PREFIX}/nl_sample_clusterview/max COMPONENT samples3d PATTERN "CVS" EXCLUDE PATTERN ".svn" EXCLUDE diff --git a/code/nel/tools/3d/object_viewer_qt/CMakeLists.txt b/code/nel/tools/3d/object_viewer_qt/CMakeLists.txt index 4dd05de9d..9d4a7bd34 100644 --- a/code/nel/tools/3d/object_viewer_qt/CMakeLists.txt +++ b/code/nel/tools/3d/object_viewer_qt/CMakeLists.txt @@ -15,7 +15,7 @@ ENDIF() ADD_SUBDIRECTORY(src) INSTALL(DIRECTORY data/ - DESTINATION share/object_viewer_qt/data + DESTINATION ${NL_SHARE_PREFIX}/object_viewer_qt/data COMPONENT data PATTERN "CVS" EXCLUDE PATTERN ".svn" EXCLUDE diff --git a/code/nelns/login_system/nel_launcher_windows_ext2/CMakeLists.txt b/code/nelns/login_system/nel_launcher_windows_ext2/CMakeLists.txt index 79093faef..f139252b8 100644 --- a/code/nelns/login_system/nel_launcher_windows_ext2/CMakeLists.txt +++ b/code/nelns/login_system/nel_launcher_windows_ext2/CMakeLists.txt @@ -20,4 +20,4 @@ IF(WITH_PCH) ENDIF(WITH_PCH) INSTALL(TARGETS nel_launcher_ext2 RUNTIME DESTINATION bin COMPONENT launcher) -INSTALL(FILES nel_launcher.cfg DESTINATION etc/nel COMPONENT launcher) +INSTALL(FILES nel_launcher.cfg DESTINATION ${NL_ETC_PREFIX} COMPONENT launcher) diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/CMakeLists.txt b/code/ryzom/tools/leveldesign/georges_editor_qt/CMakeLists.txt index 54cbc63c0..3edbb69fb 100644 --- a/code/ryzom/tools/leveldesign/georges_editor_qt/CMakeLists.txt +++ b/code/ryzom/tools/leveldesign/georges_editor_qt/CMakeLists.txt @@ -6,12 +6,12 @@ #----------------------------------------------------------------------------- # This tells the application(s) where to find the installed data. -ADD_DEFINITIONS(-DDATA_DIR="\\"${NL_SHARE_ABSOLUTE_PREFIX}/georges_editor_qt/\\"") +ADD_DEFINITIONS(-DDATA_DIR="\\"${RYZOM_SHARE_ABSOLUTE_PREFIX}/georges_editor_qt/\\"") ADD_SUBDIRECTORY(src) INSTALL(DIRECTORY data/ - DESTINATION share/georges_editor_qt/data + DESTINATION ${RYZOM_SHARE_PREFIX}/georges_editor_qt/data COMPONENT data PATTERN "CVS" EXCLUDE PATTERN ".svn" EXCLUDE