Merge branch 'fix_proj_lib_develop' into 'develop'

Fix proj lib develop

See merge request orfeotoolbox/otb!690

Packaging/Files/otbenv.bash

@@ -44,6 +44,7 @@ unset LD_LIBRARY_PATH
 
 PATH=$(cat_path "$CURRENT_DIR/bin" "$PATH")
 GDAL_DATA=$CURRENT_DIR/share/data
+PROJ_LIB=$CURRENT_DIR/share/proj
 PYTHONPATH=$(cat_path "$CURRENT_DIR/lib/python" "$PYTHONPATH")
 OTB_APPLICATION_PATH=$(cat_path "$CURRENT_DIR/lib/otb/applications" "$OTB_APPLICATION_PATH")
 GDAL_DRIVER_PATH="disable"
@@ -51,7 +52,7 @@ LC_NUMERIC=C
 
 export PATH
 export GDAL_DATA
-export GEOTIFF_CSV
+export PROJ_LIB
 export PYTHONPATH
 export OTB_APPLICATION_PATH
 export GDAL_DRIVER_PATH

Packaging/Files/otbenv.bat

@@ -26,6 +26,7 @@ call :prefix_path PYTHONPATH "%CURRENT_SCRIPT_DIR%lib\python"
 call :prefix_path OTB_APPLICATION_PATH "%CURRENT_SCRIPT_DIR%lib\otb\applications"
 
 set GDAL_DATA=%CURRENT_SCRIPT_DIR%share\data
+set PROJ_LIB=%CURRENT_SCRIPT_DIR%share\proj
 set GDAL_DRIVER_PATH=disable
 :: Set numeric locale to C
 set LC_NUMERIC=C

Packaging/Files/otbenv.profile

@@ -57,12 +57,14 @@ LC_NUMERIC=C
 # set GDAL_DATA variable used by otb application
 GDAL_DATA=OUT_DIR/share/gdal
 
+PROJ_LIB=OUT_DIR/share/proj
+
 export GDAL_DRIVER_PATH=disable
 
 # export variables
 export LC_NUMERIC
 export GDAL_DATA
-export GEOTIFF_CSV
+export PROJ_LIB
 export OTB_APPLICATION_PATH
 export PATH
 export PYTHONPATH