diff --git a/rssguard.pro b/rssguard.pro index 4adb80c9f..6b5b7bb6f 100755 --- a/rssguard.pro +++ b/rssguard.pro @@ -23,23 +23,21 @@ # Usage: # a) DEBUG build for testing. (out of source build type) # cd ../build-dir -# qmake ../rssguard-dir/rssguard.pro -r CONFIG+=debug PREFIX=C:\Program Files\RSS Guard +# qmake ../rssguard-dir/rssguard.pro -r CONFIG+=debug PREFIX=/usr # make # make install # # b) RELEASE build for production use. (out of source build type) # cd ../build-dir -# qmake ../rssguard-dir/rssguard.pro -r CONFIG+=release PREFIX=/usr INSTALL_ROOT=./app +# qmake ../rssguard-dir/rssguard.pro -r CONFIG+=release PREFIX=./usr # make -# make INSTALL_ROOT=./app install +# make install # # Variables: -# PREFIX - specifies parent folder structure under which installed files will really finally lie. -# !!! This is usually needed on Linux and its typical value would be "/usr". +# PREFIX - specifies base folder to which files are copied during "make install" step. # -# INSTALL_ROOT - specifies the folder under which compiled application data will be temporarily placed -# after the "make install" step. Note that this variable has different meaning from PREFIX which describes -# the final path and is usually "/usr". +# INSTALL_ROOT - specifies additional output folder for "make install" step. When this variable is defined, +# then it is prepended to PREFIX variable. This is useful for example on Linux, where # # LRELEASE_EXECUTABLE - specifies the name/path of "lrelease" executable, defaults to "lrelease". # @@ -92,14 +90,7 @@ isEmpty(LRELEASE_EXECUTABLE) { message(rssguard: LRELEASE_EXECUTABLE variable is not set.) } -unix:!mac { - isEmpty(INSTALL_ROOT) { - message(rssguard: Variable INSTALL_ROOT is empty.) - } -} - # Custom definitions. -DEFINES += APP_PREFIX='"\\\"$$PREFIX\\\""' DEFINES += APP_VERSION='"\\\"$$APP_VERSION\\\""' DEFINES += APP_NAME='"\\\"$$APP_NAME\\\""' DEFINES += APP_LOW_NAME='"\\\"$$APP_LOW_NAME\\\""' @@ -517,16 +508,6 @@ win32 { QMAKE_EXTRA_TARGETS += windows_all } -unix:!mac { - seven_zip.target = 7zip - seven_zip.commands = 7za a -t7z $$TARGET-$$APP_VERSION-win32.7z $$shell_path($$INSTALL_ROOT/*) - - zip.target = zip - zip.commands = 7za a -tzip $$TARGET-$$APP_VERSION-win32.zip $$shell_path($$INSTALL_ROOT/*) - - QMAKE_EXTRA_TARGETS += seven_zip zip -} - # Install all files on Windows. win32 { target.path = $$PREFIX diff --git a/src/definitions/definitions.h b/src/definitions/definitions.h index 629295a90..92658b5e8 100755 --- a/src/definitions/definitions.h +++ b/src/definitions/definitions.h @@ -208,17 +208,18 @@ #if defined(Q_OS_LINUX) -#define APP_DESKTOP_ENTRY_PATH APP_PREFIX + QString("/share/rssguard/autostart") #define APP_DESKTOP_SOURCE_ENTRY_FILE "rssguard.desktop.autostart" #define APP_DESKTOP_ENTRY_FILE "rssguard.desktop" -#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_ICON_PLAIN_PATH APP_PREFIX + QString("/share/rssguard/icons/rssguard_plain.png") -#define APP_INITIAL_FEEDS_PATH APP_PREFIX + QString("/share/rssguard/initial_feeds") + +#define APP_DESKTOP_ENTRY_PATH QApplication::applicationDirPath() + QString("/../share/rssguard/autostart") +#define APP_LANG_PATH QApplication::applicationDirPath() + QString("/../share/rssguard/l10n") +#define APP_SKIN_PATH QApplication::applicationDirPath() + QString("/../share/rssguard/skins") +#define APP_INFO_PATH QApplication::applicationDirPath() + QString("/../share/rssguard/information") +#define APP_THEME_PATH QApplication::applicationDirPath() + QString("/../share/rssguard/icons") +#define APP_MISC_PATH QApplication::applicationDirPath() + QString("/../share/rssguard/misc") +#define APP_ICON_PATH QApplication::applicationDirPath() + QString("/../share/pixmaps/rssguard.png") +#define APP_ICON_PLAIN_PATH QApplication::applicationDirPath() + QString("/../share/rssguard/icons/rssguard_plain.png") +#define APP_INITIAL_FEEDS_PATH QApplication::applicationDirPath() + QString("/../share/rssguard/initial_feeds") #elif defined(Q_OS_OSX)