Changeset 11573 for trunk/FACT++/src/Configuration.cc

Timestamp:

07/24/11 20:21:49 (13 years ago)

Author:

tbretz

Message:

Do not return the full path in UnLibToolize if it is the local path; fixed this case for fact++.rc

File:

• trunk/FACT++/src/Configuration.cc (modified) (4 diffs)

trunk/FACT++/src/Configuration.cc

@@ -1065 +1065 @@
 
     const boost::filesystem::path path(GetName());
-    const string globalfile = path.parent_path().string()+"/fact++.rc";
+    const string globalfile = (path.parent_path()/boost::filesystem::path("fact++.rc")).string();
 
     cerr << "Reading global  options from '" << globalfile << "'." << endl;
@@ -1303 +1303 @@
         fname = fname.substr(3);
 
+    string pwd;
     // If no directory is contained determine the current directory
     if (pname.empty())
@@ -1310 +1311 @@
     if (pname==".libs")
         return fname;
+
 
     // Check if the directory is long enough to contain "/.libs"
@@ -1319 +1321 @@
             pname = pname.substr(0, pos);
     }
+
+    // If the path is the local path do not return the path-name
+    if (pname==boost::filesystem::current_path().string())
+        return fname;
 
     return pname+'/'+fname;