*** empty log message ***

diff --git a/configure.ac b/configure.ac
index 5c556ee2088e0416339ffcae9df8049609eba5f1..d980cb1995b2baf365195a730d1b33149bb7e47b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -48,10 +48,10 @@ dnl Handle global configuration file placement
 dnl ---------------------------------------------------------------------------
 
 dnl FIXME: won't works
-dnl AC_DEFINE_DIR(FGIS_CONFIG, "$sysconfdir", [Define this to the location of the global config file])
-AC_SUBST_DIR(FGIS_CONFIG,"$sysconfdir")
-AC_DEFINE_UNQUOTED(FGIS_CONFIG,"$FGIS_CONFIG",[Define this to the location of the global config file])
-AC_SUBST(FGIS_CONFIG,$FGIS_CONFIG)
+dnl AC_DEFINE_DIR(FGIS_CONFDIR, "$sysconfdir", [Define this to the location of the global config file])
+AC_SUBST_DIR(FGIS_CONFDIR,"$sysconfdir")
+AC_DEFINE_UNQUOTED(FGIS_CONFDIR,"$FGIS_CONFDIR",[Define this to the location of the global config file])
+AC_SUBST(FGIS_CONFDIR,$FGIS_CONFDIR)
 
 dnl ---------------------------------------------------------------------------
 dnl Handle placement of the engine module (fgis.so)
@@ -64,8 +64,8 @@ dnl ---------------------------------------------------------------------------
 dnl Handle placement of the fGIS Tcl/Tk modules
 dnl ---------------------------------------------------------------------------
 
-AC_SUBST_DIR(FGIS_SCRIPTS,"$libdir/fgis/tcl")
-AC_SUBST(FGIS_SCRIPTS,$FGIS_SCRIPTS)
+AC_SUBST_DIR(FGIS_SCRIPTDIR,"$libdir/fgis/tcl")
+AC_SUBST(FGIS_SCRIPTDIR,$FGIS_SCRIPTDIR)
 
 dnl ---------------------------------------------------------------------------
 dnl Define path for EPPL7 library sources. Temporary hack, the whole this

diff --git a/dll/fgisInit.c b/dll/fgisInit.c
index 23e4a8e68925f933c32d7309048a7a49ca98456f..299b6d849fb6a4f8c32ad2bc80b3a5e5971c7c2b 100644 (file)
--- 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;
     }

diff --git a/etc/Makefile.am b/etc/Makefile.am
index a64fe4cd65f60153028294f64d1c7909f176781d..3c5ada86d03e39a85a61896e82b6a38232cf288b 100644 (file)
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -22,8 +22,8 @@
 install: all install-libraries
 
 install-libraries:
-       $(mkinstalldirs) $(FGIS_CONFIG)
+       $(mkinstalldirs) $(FGIS_CONFDIR)
        if [ -f fgis.rc ] ; then \
-           $(INSTALL_PROGRAM) -m 644 fgis.rc $(FGIS_CONFIG)/fgis.rc ; \
+           $(INSTALL_PROGRAM) -m 644 fgis.rc $(FGIS_CONFDIR)/fgis.rc ; \
        else true; fi
 

diff --git a/tcl/Makefile.am b/tcl/Makefile.am
index 2c1a7302f18d489393d0260c5b6a002e5c93453f..816f4094daa7e7e51023532418d7723a33e9c860 100644 (file)
--- a/tcl/Makefile.am
+++ b/tcl/Makefile.am
@@ -33,10 +33,10 @@ install-binaries:
        done
 
 install-libraries:
-       $(mkinstalldirs) $(FGIS_SCRIPTS)
+       $(mkinstalldirs) $(FGIS_SCRIPTDIR)
        -for i in $(SCRIPT_LIST) ; do \
          if [ -f $$i ] ; then \
-           $(INSTALL_PROGRAM) -m 644 $$i $(FGIS_SCRIPTS)/$$i ; \
+           $(INSTALL_PROGRAM) -m 644 $$i $(FGIS_SCRIPTDIR)/$$i ; \
          else true; fi ; \
        done
        $(mkinstalldirs) $(TCL_PACKAGE_PATH)/fgis