Changeset 8727 for trunk/MagicSoft/Mars/mbase

Timestamp:

09/03/07 10:37:51 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mbase/MEnv.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/mbase/MEnv.cc

@@ -41 +41 @@
 // some of the resources.
 //
+// If given paths are not absolute there base is always th elocation of
+// the including file.
+//
 //////////////////////////////////////////////////////////////////////////////
 #include "MEnv.h"
@@ -111 +114 @@
         return 0;
 
+    const char *dir = gSystem->DirName(GetRcName());
+
     // Tokenize the array into single files divided by a whitespace
     TObjArray *arr = incl.Tokenize(" ");
@@ -123 +128 @@
     {
         // Get file name to include
-        const char *fenv = (*arr)[i]->GetName();
+        TString fenv = (*arr)[i]->GetName();
+
+        // If the is not anabsolute path we prepend the dir-name
+        // of the including file. This allows that includes
+        // do not necessarily need absolute paths and paths are always
+        // relative to the location of th eincluding file.
+        if (!gSystem->IsAbsoluteFileName(fenv))
+        {
+            fenv.Prepend("/");
+            fenv.Prepend(dir);
+        }
 
         // Read included file and check if its valid