creaNewProject_data is now copied in share, not in bin

diff --git a/appli/creaNewProject/CMakeLists.txt b/appli/creaNewProject/CMakeLists.txt
index 3f138d5128dbff51e85ee37d9fedea90483f5f38..e6576932e059fc4f6e349ede76bd2f8bec9c999c 100644 (file)
--- a/appli/creaNewProject/CMakeLists.txt
+++ b/appli/creaNewProject/CMakeLists.txt
@@ -72,7 +72,7 @@ IF(WIN32)
   
 ELSE(WIN32)
 
-
+# ======================= LINUX =======================
 
   # Build tree 
   CONFIGURE_FILE(
@@ -83,7 +83,7 @@ ELSE(WIN32)
   
  # CONFIGURE_FILE(
  #   ${CMAKE_CURRENT_SOURCE_DIR}/NewProject/lib/template_lib/creaSystem.h.in
-    #${EXECUTABLE_OUTPUT_PATH}/NewProject/lib/template_lib/${PROJECT_NAME}System.h
+ #   ${EXECUTABLE_OUTPUT_PATH}/NewProject/lib/template_lib/${PROJECT_NAME}System.h
  #   ${CMAKE_CURRENT_SOURCE_DIR}/NewProject/lib/template_lib/${PROJECT_NAME}System.h
  #   @ONLY IMMEDIATE
  #   )
@@ -91,16 +91,16 @@ ELSE(WIN32)
   CREA_MKDIR(${EXECUTABLE_OUTPUT_PATH}/creaNewProject_data)
   CREA_CPDIR(${INPUT_PROJECT_DIR} ${EXECUTABLE_OUTPUT_PATH}/creaNewProject_data )
 
-
   # Install tree
   INSTALL(
     FILES ${EXECUTABLE_OUTPUT_PATH}/creaNewProject.sh
     DESTINATION bin
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
     )
-  INSTALL( 
+
+  INSTALL(
     DIRECTORY ${EXECUTABLE_OUTPUT_PATH}/creaNewProject_data
-    DESTINATION bin
+    DESTINATION share
     )  
   
 ENDIF(WIN32)

diff --git a/appli/creaNewProject/creaNewProject.cpp b/appli/creaNewProject/creaNewProject.cpp
index 2861429ba2da4b8890d5c52eccf8ea93c562527b..2eeea9521c98c65237ac2eba8c4382b2fad47fe8 100644 (file)
--- a/appli/creaNewProject/creaNewProject.cpp
+++ b/appli/creaNewProject/creaNewProject.cpp
@@ -11,7 +11,7 @@ IMPLEMENT_APP(myApp);
 CREA_WXMAIN_WITH_CONSOLE
 
 bool myApp::OnInit( )
-{       
+{
   wxApp::OnInit();
 #ifdef __WXGTK__
   //See http://www.wxwindows.org/faqgtk.htm#locale

diff --git a/appli/creaNewProject/creaNewProject.sh.in b/appli/creaNewProject/creaNewProject.sh.in
index 235558e02623308fe0f6229836b4859b8246f6d0..36361679a839be7ac112fc508f232b7fc5138276 100755 (executable)
--- a/appli/creaNewProject/creaNewProject.sh.in
+++ b/appli/creaNewProject/creaNewProject.sh.in
@@ -11,7 +11,7 @@ fi
 TMP=$(which $0|rev)
 BINPATH=$(echo ${TMP#*/}|rev)
 # Input data path
-INPUT=${BINPATH}/creaNewProject_data
+INPUT=${BINPATH}/../share/creaNewProject_data
 
 OUTPUT=$1
 PROJECT=$2