# # # patch "NEWS" # from [461217ec1cc2f311753e078099f21c3adbd8e313] # to [3a06570f81913373fbd548188cb969f2cfec6f89] # # patch "README" # from [bca985a08fe53048e47fe37545ae7c3317ffead5] # to [1860afad1723423e6acce38cd75d01ef01f662dd] # # patch "guitone.pro" # from [46334fdb389c5aee4cb23bbe1372abbafd3b3509] # to [f07ec519dc3fc24313bd671f69708a393d35a2da] # ============================================================ --- NEWS 461217ec1cc2f311753e078099f21c3adbd8e313 +++ NEWS 3a06570f81913373fbd548188cb969f2cfec6f89 @@ -3,6 +3,8 @@ xxxx-xx-xx (1.0rc4) - bugfix: crash when guitone's open prompt dialog was closed (closes FS#53) - bugfix: the Windows installer did not include the needed OpenSSL files for the application update to work + - internal: BINDIR, DATADIR, DOCDIR, MIMEDIR, APPDIR and PIXMAPDIR qmake + variables for custom Linux installations added 2010-04-25 (1.0rc3) - changed: the possibility to select branch sets like com.project* in ============================================================ --- README bca985a08fe53048e47fe37545ae7c3317ffead5 +++ README 1860afad1723423e6acce38cd75d01ef01f662dd @@ -62,8 +62,30 @@ Path to Mac OS X' hdiutil disk utility (Default: hdiutil) PREFIX (Linux only): - Installation prefix (Default: /usr) + Installation prefix (Default: /usr) + BINDIR (Linux only): + Installation directory for binaries (Default: PREFIX/bin) + + DATADIR (Linux only): + Installation directory for data (Default: PREFIX/share) + + APPDIR (Linux only): + Installation directory for .desktop files + (Default: DATADIR/applications) + + DOCDIR (Linux only) + Installation directory for documentation + (Default: DATADIR/doc/guitone) + + MIMEDIR (Linux only): + Installation directory for mime configuration files + (Default: DATADIR/mime/packages) + + PIXMAPDIR (Linux only): + Directory for icons and pixmaps (Default: DATADIR/pixmaps) + + All created files can be found in bin/. ============================================================ --- guitone.pro 46334fdb389c5aee4cb23bbe1372abbafd3b3509 +++ guitone.pro f07ec519dc3fc24313bd671f69708a393d35a2da @@ -300,16 +300,23 @@ unix:!macx { # *nix specific configuration unix:!macx { isEmpty(PREFIX):PREFIX="/usr" + isEmpty(BINDIR):BINDIR="$$PREFIX/bin" + isEmpty(DATADIR):DATADIR="$$PREFIX/share" + isEmpty(PIXMAPDIR):PIXMAPDIR="$$DATADIR/pixmaps" + isEmpty(DOCDIR):DOCDIR="$$DATADIR/doc/$${TARGET}" + isEmpty(APPDIR):APPDIR="$$DATADIR/applications" + isEmpty(MIMEDIR):MIMEDIR="$$DATADIR/mime/packages" - target.path = $$PREFIX/bin + target.path = $$BINDIR icon.files = res/icons/$${TARGET}.png - icon.path = $$PREFIX/share/pixmaps + icon.path = $$PIXMAPDIR docs.files = NEWS README README.driver COPYING - docs.path = $$PREFIX/share/doc/$$TARGET-$$VERSION + docs.path = $$DOCDIR desktop.files = res/linux/$${TARGET}.desktop - desktop.path = $$PREFIX/share/applications + desktop.path = $$APPDIR mime.files = res/linux/guitone.xml - mime.path = $$PREFIX/share/mime/packages + mime.path = $$MIMEDIR + INSTALLS += target icon docs desktop mime }