Complete the removal of the embedding stuff. Maybe. It's hard to be sure we got every...

[lyx.git] / src / support / Package.cpp

diff --git a/src/support/Package.cpp b/src/support/Package.cpp
index 4c886029a50af679b1d2c4b23560e1923c7d4549..241a708afab6663e2968b5ce642cdc58bc2c2fce 100644 (file)
--- a/src/support/Package.cpp
+++ b/src/support/Package.cpp
@@ -73,7 +73,7 @@ Package const & package()
        // Commented out because package().locale_dir() can be called
        // from the message translation code in Messages.cpp before
        // init_package() is called. Lars is on the case...
-       // BOOST_ASSERT(initialised_);
+       // LASSERT(initialised_, /**/);
        return package_;
 }
 
@@ -379,8 +379,9 @@ FileName const abs_path_from_command_line(string const & command_line)
        if (command_line.empty())
                return FileName();
 
-       string const path = fix_dir_name(command_line);
-       return os::is_absolute_path(path) ? FileName(path) : makeAbsPath(path);
+       string const str_path = fix_dir_name(command_line);
+       FileName path(str_path);
+       return path.isAbsolute() ? path : makeAbsPath(str_path);
 }
 
 
@@ -397,8 +398,9 @@ FileName const get_binary_path(string const & exe)
 #else
        string const exe_path = os::internal_path(exe);
 #endif
-       if (os::is_absolute_path(exe_path))
-               return FileName(exe_path);
+       FileName exepath(exe_path);
+       if (exepath.isAbsolute())
+               return exepath;
 
        // Two possibilities present themselves.
        // 1. The binary is relative to the CWD.