diff --git a/rssguard.pro b/rssguard.pro index 72c2a4282..062b7d8fc 100755 --- a/rssguard.pro +++ b/rssguard.pro @@ -597,8 +597,8 @@ win32 { sql feeds texts ico app_icon app_plain_icon translations } -# Install all files on Linux. -unix:!mac { +# Install all files on Linux and Mac OSX. +unix: { target.path = $$PREFIX/bin # Install SQL initializers. @@ -625,16 +625,21 @@ unix:!mac { misc_texts.files = $$TEXTS misc_texts.path = $$quote($$PREFIX/share/$$TARGET/information/) + translations.files = $$OUT_PWD/l10n + translations.path = $$quote($$PREFIX/share/$$TARGET/) + + INSTALLS += target misc_sql misc_icons misc_feeds \ + misc_icon misc_plain_icon skins misc_texts \ + translations +} + +# Install files on Linux only. +unix:!mac { desktop_file.files = resources/desktop/$${TARGET}.desktop desktop_file.path = $$quote($$PREFIX/share/applications/) desktop_file_autostart.files = resources/desktop/$${TARGET}.desktop.autostart desktop_file_autostart.path = $$quote($$PREFIX/share/$${TARGET}/autostart/) - translations.files = $$OUT_PWD/l10n - translations.path = $$quote($$PREFIX/share/$$TARGET/) - - INSTALLS += target misc_sql misc_icons misc_feeds \ - misc_icon misc_plain_icon skins misc_texts \ - desktop_file desktop_file_autostart translations + INSTALLS += desktop_file desktop_file_autostart } diff --git a/src/definitions/definitions.h b/src/definitions/definitions.h index 4286c260d..a0bbcbe4c 100755 --- a/src/definitions/definitions.h +++ b/src/definitions/definitions.h @@ -218,6 +218,16 @@ #define APP_ICON_PATH APP_PREFIX + QString("/share/pixmaps/rssguard.png") #define APP_ICON_PLAIN_PATH APP_PREFIX + QString("/share/rssguard/icons/rssguard_plain.png") #define APP_INITIAL_FEEDS_PATH APP_PREFIX + QString("/share/rssguard/initial_feeds") +#elif defined(Q_OS_OSX) +#define APP_LANG_PATH APP_PREFIX + QString("/share/rssguard/l10n") +#define APP_SKIN_PATH APP_PREFIX + QString("/share/rssguard/skins") +#define APP_INFO_PATH APP_PREFIX + QString("/share/rssguard/information") +#define APP_THEME_PATH APP_PREFIX + QString("/share/rssguard/icons") +#define APP_MISC_PATH APP_PREFIX + QString("/share/rssguard/misc") +#define APP_ICON_PATH APP_PREFIX + QString("/share/pixmaps/rssguard.png") +#define APP_INFO_PATH APP_PREFIX + QString("/share/rssguard/information") +#define APP_ICON_PLAIN_PATH APP_PREFIX + QString("/share/rssguard/icons/rssguard_plain.png") +#define APP_INITIAL_FEEDS_PATH APP_PREFIX + QString("/share/rssguard/initial_feeds") #elif defined(Q_OS_WIN) #define APP_LANG_PATH QApplication::applicationDirPath() + QString("/l10n") #define APP_SKIN_PATH QApplication::applicationDirPath() + QString("/skins")