#if !defined (USE_WINDOWS_PACKAGING) && \
!defined (USE_MACOSX_PACKAGING) && \
+ !defined (USE_HAIKU_PACKAGING) && \
!defined (USE_POSIX_PACKAGING)
-#error USE_FOO_PACKAGING must be defined for FOO = WINDOWS, MACOSX or POSIX.
+#error USE_FOO_PACKAGING must be defined for FOO = WINDOWS, MACOSX, HAIKU or POSIX.
#endif
#if defined (USE_MACOSX_PACKAGING)
string Package::getConfigureLockName() const
{
- return user_support().absFileName() + ".lyx_configure_lock";
+ return addName(user_support().absFileName(), ".lyx_configure_lock");
}
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;
}
#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.
return FileName(addPath(fromqstr(QDesktopServices::storageLocation(QDesktopServices::DataLocation)), PACKAGE));
+#elif defined (USE_HAIKU_PACKAGING)
+ return FileName(addPath(home_dir.absFileName(), string("/config/settings/") + PACKAGE));
+
#else // USE_POSIX_PACKAGING
return FileName(addPath(home_dir.absFileName(), string(".") + PACKAGE));
#endif