Ticket #34960: datadir.diff

src/dtcc/CoordinateSystems/datum/DatumLibraryImplementation.cpp

@@ -2006 +2006 @@
   else
   {
     FileName7 = new char[ file_name_length ];
-    strcpy( FileName7, "../../data/" );
+    strcpy( FileName7, MSPCCS_DATA_DEFAULT );
   }
   strcat( FileName7, "7_param.dat" );
 
@@ -2124 +2124 @@
     else
     {
        FileName3 = new char[ file_name_length ];
-       strcpy( FileName3, "../../data/" );
+       strcpy( FileName3, MSPCCS_DATA_DEFAULT );
     }
     strcat( FileName3, "3_param.dat" );
 
@@ -2244 +2244 @@
   }
   else
   {
-    strcpy( FileName, "../../data/" );
+    strcpy( FileName, MSPCCS_DATA_DEFAULT );
   }
   strcat( FileName, "3_param.dat" );
 
@@ -2324 +2324 @@
   }
   else
   {
-    strcpy( FileName, "../../data/" );
+    strcpy( FileName, MSPCCS_DATA_DEFAULT );
   }
   strcat( FileName, "7_param.dat" );
 

src/dtcc/CoordinateSystems/ellipse/EllipsoidLibraryImplementation.cpp

@@ -349 +349 @@
     }
     else
     {
-      strcpy( FileName, "../../data/" );
+      strcpy( FileName, MSPCCS_DATA_DEFAULT );
     }
     strcat( FileName, "ellips.dat" );
 
@@ -439 +439 @@
     }
     else
     {
-      strcpy( FileName, "../../data/" );
+      strcpy( FileName, MSPCCS_DATA_DEFAULT );
     }
     strcat( FileName, "ellips.dat" );
     if( ( fp = fopen( FileName, "w" ) ) == NULL )
@@ -686 +686 @@
   else
   {
     FileName = new char[ 22 ];
-    strcpy( FileName, "../../data/" );
+    strcpy( FileName, MSPCCS_DATA_DEFAULT );
   }
   strcat( FileName, "ellips.dat" );
 

src/dtcc/GeoidLibrary.cpp

@@ -1053 +1053 @@
   else
   {
     file_name = new char[ 21 ];
-    strcpy( file_name, "../../data/" );
+    strcpy( file_name, MSPCCS_DATA_DEFAULT );
   }
   strcat( file_name, "egm96.grd" );
 
@@ -1148 +1148 @@
   else
   {
     file_name =new char[ 21 ];
-    strcpy( file_name, "../../data/" );
+    strcpy( file_name, MSPCCS_DATA_DEFAULT );
   }
   strcat( file_name, "egm84.grd" );
 
@@ -1216 +1216 @@
   else
   {
     file_name =new char[ 22 ]; 
-    strcpy( file_name, "../../data/" );
+    strcpy( file_name, MSPCCS_DATA_DEFAULT );
   }
   strcat( file_name, "wwgrid.bin" );
 

src/dtcc/egm2008_geoid_grid.cpp

@@ -97 +97 @@
 
    if ( NULL == pathName )
    {
-      strcpy( pathName, "../../data" );
+      pathName = MSPCCS_DATA_DEFAULT;
    }
 
    length          = strlen( pathName );
@@ -122 +122 @@
    //if ( NULL == dataPath )
    //{
    //   undefEnvVar = 1;
-   //   strcpy( dataPath, "../../data" );
+   //   strcpy( dataPath, MSPCCS_DATA_DEFAULT );
    //}
    //
    //// Assemble the path and file name