ws changes mostly

[lyx.git] / src / lyx_main.C

diff --git a/src/lyx_main.C b/src/lyx_main.C
index 9d0bdf105a5b81782b4221e97c23034a9fb54b9d..e356ffa7aafdf826e68c86ab8aabac29f520008a 100644 (file)
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -205,7 +205,8 @@ void LyX::priv_exec(int & argc, char * argv[])
        // we need to parse for "-dbg" and "-help"
        bool const want_gui = easyParse(argc, argv);
 
-       lyx::support::init_package(argv[0], cl_system_support, cl_user_support);
+       lyx::support::init_package(argv[0], cl_system_support, cl_user_support,
+                                  lyx::support::top_build_dir_is_one_level_up);
 
        if (want_gui)
                lyx_gui::parse_init(argc, argv);
@@ -483,7 +484,8 @@ void LyX::init(bool gui)
        if (reconfigure)
                reconfigureUserLyXDir();
 
-       if (fs::is_directory(lyxrc.document_path))
+       if (fs::exists(lyxrc.document_path) &&
+           fs::is_directory(lyxrc.document_path))
                package().document_dir() = lyxrc.document_path;
 
        package().temp_dir() = createLyXTmpDir(lyxrc.tempdir_path);
@@ -611,7 +613,8 @@ bool LyX::queryUserLyXDir(bool explicit_userdir)
        bool reconfigure = false;
 
        // Does user directory exist?
-       if (fs::is_directory(package().user_support())) {
+       if (fs::exists(package().user_support()) &&
+           fs::is_directory(package().user_support())) {
                first_start = false;
                string const configure_script =
                        AddName(package().system_support(), "configure");