ENH: avoid multiplying the install dirs. install applications inside /lib/otb/applications

CMake/otbcli.sh.in

@@ -9,7 +9,7 @@ CURRENT_SCRIPT=$0
 CURRENT_SCRIPT_DIR=`dirname $0`
 
 OTB_CLI_LAUNCHER=$CURRENT_SCRIPT_DIR/otbApplicationLauncherCommandLine
-OTB_APP_PATH=$CURRENT_SCRIPT_DIR/../lib/otbapp
+OTB_APP_PATH=$CURRENT_SCRIPT_DIR/../lib/otb/applications
 
 $OTB_CLI_LAUNCHER @APPLICATION_NAME@ --modulePath $OTB_APP_PATH "$@"
 

CMake/otbgui.sh.in

@@ -9,7 +9,7 @@ CURRENT_SCRIPT=$0
 CURRENT_SCRIPT_DIR=`dirname $0`
 
 OTB_GUI_LAUNCHER=$CURRENT_SCRIPT_DIR/otbApplicationLauncherQt
-OTB_APP_PATH=$CURRENT_SCRIPT_DIR/../lib/otbapp
+OTB_APP_PATH=$CURRENT_SCRIPT_DIR/../lib/otb/applications
 
 $OTB_GUI_LAUNCHER @APPLICATION_NAME@ $OTB_APP_PATH "$@"
 

CMakeLists.txt

@@ -153,7 +153,7 @@ IF(NOT OTB_INSTALL_LIB_DIR)
 ENDIF(NOT OTB_INSTALL_LIB_DIR)
 
 IF(NOT OTB_INSTALL_APP_DIR)
-  SET(OTB_INSTALL_APP_DIR "/lib/otbapp")
+  SET(OTB_INSTALL_APP_DIR "/lib/otb/applications")
 ENDIF(NOT OTB_INSTALL_APP_DIR)
 
 IF(NOT OTB_INSTALL_LIB_DIR)