Check return value of regex_match instead of looking at first match

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

diff --git a/src/support/Package.cpp b/src/support/Package.cpp
index b15879cc9fb46a3b0afec19f0498f3f08c0a3975..bdba77e7ac72780cafd97a6ad3e3b341683b6789 100644 (file)
--- a/src/support/Package.cpp
+++ b/src/support/Package.cpp
@@ -177,7 +177,7 @@ int Package::reconfigureUserLyXDir(string const & option) const
 
 string Package::getConfigureLockName() const
 {
-       return user_support().absFileName() + ".lyx_configure_lock";
+       return addName(user_support().absFileName(), ".lyx_configure_lock");
 }
 
 
@@ -302,7 +302,7 @@ bool isBuildDir(FileName const & abs_binary, string const & dir_location,
         return true;
     }
     //  cmake file, no Makefile in lib
-    FileName build_boost_dir = FileName(addPath(search_dir, "boost"));
+    FileName build_boost_dir = FileName(addPath(search_dir + "/3rdparty", "boost"));
     if (!fileSearch(build_boost_dir.absFileName(), "cmake_install.cmake").empty()) {
         return true;
     }
@@ -651,9 +651,6 @@ get_system_support_dir(FileName const & abs_binary,
                                "to the LyX system directory containing the "
                                "file `chkconfig.ltx'."),
                          from_utf8(searched_dirs_str), from_ascii(LYX_DIR_VER)));
-
-       // Keep the compiler happy.
-       return FileName();
 }
 
 
@@ -691,7 +688,7 @@ FileName const get_default_user_support_dir(FileName const & home_dir)
 
 #elif defined (USE_MACOSX_PACKAGING) && (QT_VERSION >= 0x050000)
        (void)home_dir; // Silence warning about unused variable.
-       return FileName(addPath(fromqstr(QStandardPaths::writableLocation(QStandardPaths::DataLocation)), PACKAGE));
+       return FileName(addPath(fromqstr(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation)), PACKAGE));
 
 #elif defined (USE_MACOSX_PACKAGING)
        (void)home_dir; // Silence warning about unused variable.