diff --git a/src/breakpad/BreakPad.cpp b/src/breakpad/BreakPad.cpp index a76b84124..0215d7796 100644 --- a/src/breakpad/BreakPad.cpp +++ b/src/breakpad/BreakPad.cpp @@ -82,14 +82,14 @@ BreakPad::BreakPad( const QString& path, bool active ) QString reporter; QString localReporter = QString( "%1/%2" ).arg( qApp->applicationDirPath() ).arg( CRASH_REPORTER_BINARY ); - QString globalReporter = QString( "%1/%2" ).arg( CMAKE_INSTALL_PREFIX "/" CMAKE_INSTALL_LIBEXECDIR ).arg( CRASH_REPORTER_BINARY ); + QString globalReporter = QString( "%1/%2" ).arg( CMAKE_INSTALL_FULL_LIBEXECDIR ).arg( CRASH_REPORTER_BINARY ); if ( QFileInfo( localReporter ).exists() ) reporter = localReporter; else if ( QFileInfo( globalReporter ).exists() ) reporter = globalReporter; else - tLog() << "Could not find \"" CRASH_REPORTER_BINARY "\" in \"" CMAKE_INSTALL_PREFIX "/" CMAKE_INSTALL_LIBEXECDIR "\" or application path"; + tLog() << "Could not find \"" CRASH_REPORTER_BINARY "\" in \"" CMAKE_INSTALL_FULL_LIBEXECDIR "\" or application path"; char* creporter; std::string sreporter = reporter.toStdString(); diff --git a/src/config.h.in b/src/config.h.in index ce0963ecd..42e6a346b 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -9,7 +9,7 @@ #cmakedefine DEBUG_BUILD #define CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" -#define CMAKE_INSTALL_LIBEXECDIR "${CMAKE_INSTALL_LIBEXECDIR}" +#define CMAKE_INSTALL_FULL_LIBEXECDIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}" #define CMAKE_SYSTEM "${CMAKE_SYSTEM}" #cmakedefine LION diff --git a/src/resolversmodel.cpp b/src/resolversmodel.cpp index b27e00791..c38b02b44 100644 --- a/src/resolversmodel.cpp +++ b/src/resolversmodel.cpp @@ -208,7 +208,7 @@ ResolversModel::addInstalledResolvers() QDir appDir( qApp->applicationDirPath() ); QDir libDir( CMAKE_INSTALL_PREFIX "/lib" ); - QDir libexecDir( CMAKE_INSTALL_LIBEXECDIR ); + QDir libexecDir( CMAKE_INSTALL_FULL_LIBEXECDIR ); QDir lib64Dir( appDir ); lib64Dir.cdUp();