X-Git-Url: http://www.wagner.pp.ru/gitweb/?p=oss%2Ffgis.git;a=blobdiff_plain;f=dll%2FfgisInit.c;h=299b6d849fb6a4f8c32ad2bc80b3a5e5971c7c2b;hp=23e4a8e68925f933c32d7309048a7a49ca98456f;hb=96a9075a6b6a85c93540b7e94c719e496823674d;hpb=798b680fafac5b8a0f10d896cb5df4628a3b67b5 diff --git a/dll/fgisInit.c b/dll/fgisInit.c index 23e4a8e..299b6d8 100644 --- a/dll/fgisInit.c +++ b/dll/fgisInit.c @@ -1,5 +1,5 @@ /****************************************************************************** - * $Id: fgisInit.c,v 1.2 2003-01-02 18:02:52 dron Exp $ + * $Id: fgisInit.c,v 1.3 2003-01-08 09:50:05 dron Exp $ * * Project: fGIS core engine * Purpose: initialization procedure for Fgis package @@ -47,7 +47,7 @@ int check_for_rc(Tcl_Interp *interp,char *home,char *path); * defines default (1:1) reclass table * defines fGIS_HOME variable to directory, containing fgis.rc * Directories are searched in following order - * FGIS_CONFIG as defined in Makefile + * FGIS_CONFDIR as defined in Makefile * ~/lib/fgis * executes fgis.rc */ @@ -107,7 +107,7 @@ EXPORT(int, Fgis_Init)(Tcl_Interp *interp) if ((fGIS_HOME=Tcl_GetVar(interp,"fGIS_HOME",TCL_GLOBAL_ONLY))==NULL) { fGIS_HOME=buffer; /* Check if compilied in default is valid */ - if (!check_for_rc(interp,fGIS_HOME,FGIS_CONFIG)&& + if (!check_for_rc(interp,fGIS_HOME,FGIS_CONFDIR)&& #ifdef __unix__ !check_for_rc(interp,fGIS_HOME,"/usr/local/lib/fgis")&& !check_for_rc(interp,fGIS_HOME,"/usr/lib/fgis")&& @@ -125,7 +125,7 @@ EXPORT(int, Fgis_Init)(Tcl_Interp *interp) Tcl_SetVar(interp,"fGIS_HOME",fGIS_HOME,TCL_GLOBAL_ONLY); } - if (Tcl_EvalFile(interp,FGIS_CONFIG "/fgis.rc")!=TCL_OK) { + if (Tcl_EvalFile(interp,FGIS_CONFDIR "/fgis.rc")!=TCL_OK) { Tcl_SetResult(interp,"Error in initialization file",TCL_STATIC); return TCL_ERROR; }