changed plugin path (qmake)

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@8053 90c681e8-e032-0410-971d-27865f9a5e38

72 files changed, 94 insertions, 80 deletions

diff --git a/qmmp.pri b/qmmp.pri
index 491a93ea9..d30eb2a04 100644
--- a/qmmp.pri
+++ b/qmmp.pri
@@ -26,6 +26,21 @@ QT += widgets
 
 QMMP_VERSION = 1.3.0
 
+#Install paths
+
+VERSIONS = $$split(QMMP_VERSION, ".")
+
+QMMP_VERSION_MAJOR = $$member(VERSIONS, 0)
+QMMP_VERSION_MINOR = $$member(VERSIONS, 1)
+
+unix {
+  isEmpty(PREFIX): PREFIX=/usr
+  isEmpty(BIN_DIR): BIN_DIR=$$PREFIX/bin
+  isEmpty(DATA_DIR): DATA_DIR=$$PREFIX/share
+  isEmpty(LIB_DIR): LIB_DIR=$$PREFIX/lib
+  isEmpty(PLUGIN_DIR): PLUGIN_DIR=$$LIB_DIR/qmmp-$${QMMP_VERSION_MAJOR}.$${QMMP_VERSION_MINOR}
+}
+
 #Comment/uncomment this if you want to change plugins list
 
 CONFIG += ARCHIVE_PLUGIN
diff --git a/qmmp.pro b/qmmp.pro
index d532aeef5..88d11f4e7 100644
--- a/qmmp.pro
+++ b/qmmp.pro
@@ -39,4 +39,8 @@ win32:system(for /r %B in (*.ts) do $$LRELEASE_EXECUTABLE -compress %B)
 
 message("******* BUILD CONFIGURATION *******")
 for(out, CONFIG):message($$out)
+message(PREFIX=$$PREFIX)
+message(BIN_DIR=$$BIN_DIR)
+message(DATA_DIR=$$DATA_DIR)
+message(PLUGIN_DIR=$$PLUGIN_DIR)
 message("*** END OF BUILD CONFIGURATION ****")
diff --git a/src/app/app.pro b/src/app/app.pro
index 2b76cb2fa..9f4983167 100644
--- a/src/app/app.pro
+++ b/src/app/app.pro
@@ -22,20 +22,20 @@ INCLUDEPATH += ../
 unix {
     LIBS += -lqmmp -lqmmpui
     QMAKE_LIBDIR += ../../lib
-    target.path = /bin
+    target.path = $$BIN_DIR
     desktop.files = qmmp.desktop \
         qmmp-enqueue.desktop \
         qmmp-dir.desktop
-    desktop.path = /share/applications
+    desktop.path = $$DATA_DIR/applications
     icon16.files = images/16x16/qmmp.png
     icon32.files = images/32x32/qmmp.png
     icon48.files = images/48x48/qmmp.png
     icon_svg.files = images/scalable/qmmp.svgz \
         images/scalable/qmmp-simple.svgz
-    icon16.path = /share/icons/hicolor/16x16/apps
-    icon32.path = /share/icons/hicolor/32x32/apps
-    icon48.path = /share/icons/hicolor/48x48/apps
-    icon_svg.path = /share/icons/hicolor/scalable/apps
+    icon16.path = $$DATA_DIR/icons/hicolor/16x16/apps
+    icon32.path = $$DATA_DIR/icons/hicolor/32x32/apps
+    icon48.path = $$DATA_DIR/icons/hicolor/48x48/apps
+    icon_svg.path = $$DATA_DIR/icons/hicolor/scalable/apps
     INSTALLS += desktop \
         target \
         icon16 \
diff --git a/src/plugins/CommandLineOptions/IncDecVolumeOption/IncDecVolumeOption.pro b/src/plugins/CommandLineOptions/IncDecVolumeOption/IncDecVolumeOption.pro
index 035189806..1d54601a6 100644
--- a/src/plugins/CommandLineOptions/IncDecVolumeOption/IncDecVolumeOption.pro
+++ b/src/plugins/CommandLineOptions/IncDecVolumeOption/IncDecVolumeOption.pro
@@ -10,5 +10,5 @@ RESOURCES = translations/translations.qrc
 
 LIBS += $$QMMPUI_LIB
 
-target.path = $$LIB_DIR/qmmp/CommandLineOptions
+target.path = $$PLUGIN_DIR/CommandLineOptions
 INSTALLS += target
diff --git a/src/plugins/CommandLineOptions/PlayListOption/PlayListOption.pro b/src/plugins/CommandLineOptions/PlayListOption/PlayListOption.pro
index a9dd56cbd..b1a63cd6a 100644
--- a/src/plugins/CommandLineOptions/PlayListOption/PlayListOption.pro
+++ b/src/plugins/CommandLineOptions/PlayListOption/PlayListOption.pro
@@ -10,5 +10,5 @@ RESOURCES = translations/translations.qrc
 
 LIBS += $$QMMPUI_LIB
 
-target.path = $$LIB_DIR/qmmp/CommandLineOptions
+target.path = $$PLUGIN_DIR/CommandLineOptions
 INSTALLS += target
diff --git a/src/plugins/CommandLineOptions/SeekOption/SeekOption.pro b/src/plugins/CommandLineOptions/SeekOption/SeekOption.pro
index 041dea806..053660404 100644
--- a/src/plugins/CommandLineOptions/SeekOption/SeekOption.pro
+++ b/src/plugins/CommandLineOptions/SeekOption/SeekOption.pro
@@ -10,5 +10,5 @@ RESOURCES = translations/translations.qrc
 
 LIBS += $$QMMPUI_LIB
 
-target.path = $$LIB_DIR/qmmp/CommandLineOptions
+target.path = $$PLUGIN_DIR/CommandLineOptions
 INSTALLS += target
diff --git a/src/plugins/CommandLineOptions/StatusOption/StatusOption.pro b/src/plugins/CommandLineOptions/StatusOption/StatusOption.pro
index f6f67e018..96ad74260 100644
--- a/src/plugins/CommandLineOptions/StatusOption/StatusOption.pro
+++ b/src/plugins/CommandLineOptions/StatusOption/StatusOption.pro
@@ -10,5 +10,5 @@ RESOURCES = translations/translations.qrc
 
 LIBS += $$QMMPUI_LIB
 
-target.path = $$LIB_DIR/qmmp/CommandLineOptions
+target.path = $$PLUGIN_DIR/CommandLineOptions
 INSTALLS += target
diff --git a/src/plugins/Effect/bs2b/bs2b.pro b/src/plugins/Effect/bs2b/bs2b.pro
index 49472b97a..ed5f45bb8 100644
--- a/src/plugins/Effect/bs2b/bs2b.pro
+++ b/src/plugins/Effect/bs2b/bs2b.pro
@@ -15,7 +15,7 @@ FORMS += settingsdialog.ui
 RESOURCES = translations/translations.qrc
 
 unix {
-    target.path = $$LIB_DIR/qmmp/Effect
+    target.path = $$PLUGIN_DIR/Effect
     INSTALLS += target
     PKGCONFIG += libbs2b
     LIBS += -L/usr/lib -I/usr/include
diff --git a/src/plugins/Effect/crossfade/crossfade.pro b/src/plugins/Effect/crossfade/crossfade.pro
index 84378c3e8..6c4d07754 100644
--- a/src/plugins/Effect/crossfade/crossfade.pro
+++ b/src/plugins/Effect/crossfade/crossfade.pro
@@ -15,6 +15,6 @@ FORMS += settingsdialog.ui
 RESOURCES = translations/translations.qrc
 
 unix {
-    target.path = $$LIB_DIR/qmmp/Effect
+    target.path = $$PLUGIN_DIR/Effect
     INSTALLS += target
 }
diff --git a/src/plugins/Effect/filewriter/filewriter.pro b/src/plugins/Effect/filewriter/filewriter.pro
index ce1e096a2..770604428 100644
--- a/src/plugins/Effect/filewriter/filewriter.pro
+++ b/src/plugins/Effect/filewriter/filewriter.pro
@@ -17,7 +17,7 @@ RESOURCES = translations/translations.qrc
 LIBS += $$QMMPUI_LIB
 
 unix {
-    target.path = $$LIB_DIR/qmmp/Effect
+    target.path = $$PLUGIN_DIR/Effect
     INSTALLS += target
     PKGCONFIG += ogg vorbis vorbisenc
 }
diff --git a/src/plugins/Effect/ladspa/ladspa.pro b/src/plugins/Effect/ladspa/ladspa.pro
index 7fb3402e7..3ed178a3a 100644
--- a/src/plugins/Effect/ladspa/ladspa.pro
+++ b/src/plugins/Effect/ladspa/ladspa.pro
@@ -24,5 +24,5 @@ RESOURCES = translations/translations.qrc
 LIBS += -L/usr/lib -I/usr/include
 linux-g++|linux-g++-32|linux-g++-64:LIBS += -ldl
 
-target.path = $$LIB_DIR/qmmp/Effect
+target.path = $$PLUGIN_DIR/Effect
 INSTALLS += target
diff --git a/src/plugins/Effect/soxr/soxr.pro b/src/plugins/Effect/soxr/soxr.pro
index 904146726..f62c14795 100644
--- a/src/plugins/Effect/soxr/soxr.pro
+++ b/src/plugins/Effect/soxr/soxr.pro
@@ -15,7 +15,7 @@ FORMS += settingsdialog.ui
 RESOURCES = translations/translations.qrc
 
 unix {
-    target.path = $$LIB_DIR/qmmp/Effect
+    target.path = $$PLUGIN_DIR/Effect
     INSTALLS += target
     PKGCONFIG += soxr
     LIBS += -L/usr/lib -I/usr/include
diff --git a/src/plugins/Effect/stereo/stereo.pro b/src/plugins/Effect/stereo/stereo.pro
index 1b1af5173..4e7601878 100644
--- a/src/plugins/Effect/stereo/stereo.pro
+++ b/src/plugins/Effect/stereo/stereo.pro
@@ -15,6 +15,6 @@ FORMS += settingsdialog.ui
 RESOURCES = translations/translations.qrc
 
 unix {
-    target.path = $$LIB_DIR/qmmp/Effect
+    target.path = $$PLUGIN_DIR/Effect
     INSTALLS += target
 }
diff --git a/src/plugins/Engines/mplayer/mplayer.pro b/src/plugins/Engines/mplayer/mplayer.pro
index e6d9abad0..622a439aa 100644
--- a/src/plugins/Engines/mplayer/mplayer.pro
+++ b/src/plugins/Engines/mplayer/mplayer.pro
@@ -16,5 +16,5 @@ FORMS += settingsdialog.ui
 
 RESOURCES = translations/translations.qrc
 
-target.path = $$LIB_DIR/qmmp/Engines
+target.path = $$PLUGIN_DIR/Engines
 INSTALLS += target
diff --git a/src/plugins/FileDialogs/QmmpFileDialog/QmmpFileDialog.pro b/src/plugins/FileDialogs/QmmpFileDialog/QmmpFileDialog.pro
index 4e9e5421e..a89fe58f6 100644
--- a/src/plugins/FileDialogs/QmmpFileDialog/QmmpFileDialog.pro
+++ b/src/plugins/FileDialogs/QmmpFileDialog/QmmpFileDialog.pro
@@ -15,6 +15,6 @@ RESOURCES += translations/translations.qrc
 LIBS += $$QMMPUI_LIB
 
 unix {
-    target.path = $$LIB_DIR/qmmp/FileDialogs
+    target.path = $$PLUGIN_DIR/FileDialogs
     INSTALLS += target
 }
diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/TwoPanelFileDialog.pro b/src/plugins/FileDialogs/TwoPanelFileDialog/TwoPanelFileDialog.pro
index 02427f26f..d99467a50 100644
--- a/src/plugins/FileDialogs/TwoPanelFileDialog/TwoPanelFileDialog.pro
+++ b/src/plugins/FileDialogs/TwoPanelFileDialog/TwoPanelFileDialog.pro
@@ -16,6 +16,6 @@ LIBS += $$QMMPUI_LIB
 RESOURCES += translations/translations.qrc
 
 unix {
-    target.path = $$LIB_DIR/qmmp/FileDialogs
+    target.path = $$PLUGIN_DIR/FileDialogs
     INSTALLS += target
 }
diff --git a/src/plugins/General/converter/converter.pro b/src/plugins/General/converter/converter.pro
index f1ff74e88..25c13b163 100644
--- a/src/plugins/General/converter/converter.pro
+++ b/src/plugins/General/converter/converter.pro
@@ -23,6 +23,6 @@ LIBS += $$QMMPUI_LIB
 PKGCONFIG += taglib
 
 unix{
-    target.path = $$LIB_DIR/qmmp/General
+    target.path = $$PLUGIN_DIR/General
     INSTALLS += target
 }
diff --git a/src/plugins/General/copypaste/copypaste.pro b/src/plugins/General/copypaste/copypaste.pro
index 1f1a2041a..37a1584be 100644
--- a/src/plugins/General/copypaste/copypaste.pro
+++ b/src/plugins/General/copypaste/copypaste.pro
@@ -13,6 +13,6 @@ RESOURCES = translations/translations.qrc
 LIBS += $$QMMPUI_LIB
 
 unix {
-    target.path = $$LIB_DIR/qmmp/General
+    target.path = $$PLUGIN_DIR/General
     INSTALLS += target
 }
diff --git a/src/plugins/General/covermanager/covermanager.pro b/src/plugins/General/covermanager/covermanager.pro
index ef34f3302..c2bd72be7 100644
--- a/src/plugins/General/covermanager/covermanager.pro
+++ b/src/plugins/General/covermanager/covermanager.pro
@@ -18,6 +18,6 @@ RESOURCES = translations/translations.qrc \
 LIBS += $$QMMPUI_LIB
 
 unix {
-    target.path = $$LIB_DIR/qmmp/General
+    target.path = $$PLUGIN_DIR/General
     INSTALLS += target
 }
diff --git a/src/plugins/General/fileops/fileops.pro b/src/plugins/General/fileops/fileops.pro
index d4cff98ba..ef641e979 100644
--- a/src/plugins/General/fileops/fileops.pro
+++ b/src/plugins/General/fileops/fileops.pro
@@ -20,6 +20,6 @@ RESOURCES = translations/translations.qrc
 LIBS += $$QMMPUI_LIB
 
 unix {
-    target.path = $$LIB_DIR/qmmp/General
+    target.path = $$PLUGIN_DIR/General
     INSTALLS += target
 }
diff --git a/src/plugins/General/gnomehotkey/gnomehotkey.pro b/src/plugins/General/gnomehotkey/gnomehotkey.pro
index fa067f2b3..830c01aa3 100644
--- a/src/plugins/General/gnomehotkey/gnomehotkey.pro
+++ b/src/plugins/General/gnomehotkey/gnomehotkey.pro
@@ -14,5 +14,5 @@ RESOURCES = translations/translations.qrc
 
 LIBS += $$QMMPUI_LIB
 
-target.path = $$LIB_DIR/qmmp/General
+target.path = $$PLUGIN_DIR/General
 INSTALLS += target
diff --git a/src/plugins/General/hal/hal.pro b/src/plugins/General/hal/hal.pro
index 3ad52ba04..f11f57489 100644
--- a/src/plugins/General/hal/hal.pro
+++ b/src/plugins/General/hal/hal.pro
@@ -22,5 +22,5 @@ LIBS += $$QMMPUI_LIB
 
 RESOURCES = translations/translations.qrc
 
-target.path = $$LIB_DIR/qmmp/General
+target.path = $$PLUGIN_DIR/General
 INSTALLS += target
diff --git a/src/plugins/General/hotkey/hotkey.pro b/src/plugins/General/hotkey/hotkey.pro
index e8477431e..320d4e1a0 100644
--- a/src/plugins/General/hotkey/hotkey.pro
+++ b/src/plugins/General/hotkey/hotkey.pro
@@ -21,7 +21,7 @@ RESOURCES = translations/translations.qrc
 LIBS += $$QMMPUI_LIB

 

 unix {

-    target.path = $$LIB_DIR/qmmp/General

+    target.path = $$PLUGIN_DIR/General

     INSTALLS += target

     PKGCONFIG += x11

     DEFINES += HAVE_XKBLIB_H

diff --git a/src/plugins/General/kdenotify/kdenotify.pro b/src/plugins/General/kdenotify/kdenotify.pro
index 35b3ce238..dcc7d7a62 100644
--- a/src/plugins/General/kdenotify/kdenotify.pro
+++ b/src/plugins/General/kdenotify/kdenotify.pro
@@ -21,8 +21,8 @@ RESOURCES += translations/translations.qrc
 
 LIBS += $$QMMPUI_LIB
 
-target.path = $$LIB_DIR/qmmp/General
+target.path = $$PLUGIN_DIR/General
 images.files = images/app_icon.png \
                images/empty_cover.png
-images.path = /share/qmmp/images/
+images.path = $$DATA_DIR/qmmp/images/
 INSTALLS += target images
diff --git a/src/plugins/General/lyrics/lyrics.pro b/src/plugins/General/lyrics/lyrics.pro
index 0bdf0b4e1..e3833d68c 100644
--- a/src/plugins/General/lyrics/lyrics.pro
+++ b/src/plugins/General/lyrics/lyrics.pro
@@ -19,6 +19,6 @@ RESOURCES = translations/translations.qrc
 LIBS += $$QMMPUI_LIB
 
 unix {
-    target.path = $$LIB_DIR/qmmp/General
+    target.path = $$PLUGIN_DIR/General
     INSTALLS += target
 }
diff --git a/src/plugins/General/mpris/mpris.pro b/src/plugins/General/mpris/mpris.pro
index 3a64048aa..d08a7cb9b 100644
--- a/src/plugins/General/mpris/mpris.pro
+++ b/src/plugins/General/mpris/mpris.pro
@@ -24,5 +24,5 @@ RESOURCES = translations/translations.qrc
 
 LIBS += $$QMMPUI_LIB
 
-target.path = $$LIB_DIR/qmmp/General
+target.path = $$PLUGIN_DIR/General
 INSTALLS += target
diff --git a/src/plugins/General/notifier/notifier.pro b/src/plugins/General/notifier/notifier.pro
index d3e38c6fc..50364bb12 100644
--- a/src/plugins/General/notifier/notifier.pro
+++ b/src/plugins/General/notifier/notifier.pro
@@ -20,7 +20,7 @@ RESOURCES = notifier_images.qrc \
 LIBS += $$QMMPUI_LIB
 
 unix {
-  target.path = $$LIB_DIR/qmmp/General
+  target.path = $$PLUGIN_DIR/General
   INSTALLS += target
   PKGCONFIG += x11
   QT += x11extras
diff --git a/src/plugins/General/rgscan/rgscan.pro b/src/plugins/General/rgscan/rgscan.pro
index af749aeb3..ab21f3ac9 100644
--- a/src/plugins/General/rgscan/rgscan.pro
+++ b/src/plugins/General/rgscan/rgscan.pro
@@ -22,7 +22,7 @@ LIBS += $$QMMPUI_LIB
 
 unix {
     PKGCONFIG += taglib
-    target.path = $$LIB_DIR/qmmp/General
+    target.path = $$PLUGIN_DIR/General
     INSTALLS += target
 }
 
diff --git a/src/plugins/General/scrobbler/scrobbler.pro b/src/plugins/General/scrobbler/scrobbler.pro
index 9abd9c812..a22a54807 100644
--- a/src/plugins/General/scrobbler/scrobbler.pro
+++ b/src/plugins/General/scrobbler/scrobbler.pro
@@ -24,6 +24,6 @@ RESOURCES = translations/translations.qrc
 LIBS += $$QMMPUI_LIB
 
 unix {
-    target.path = $$LIB_DIR/qmmp/General
+    target.path = $$PLUGIN_DIR/General
     INSTALLS += target
 }
diff --git a/src/plugins/General/statusicon/statusicon.pro b/src/plugins/General/statusicon/statusicon.pro
index dd0ca0999..ea58631cb 100644
--- a/src/plugins/General/statusicon/statusicon.pro
+++ b/src/plugins/General/statusicon/statusicon.pro
@@ -24,6 +24,6 @@ RESOURCES = translations/translations.qrc \
 LIBS += $$QMMPUI_LIB
 
 unix {
-    target.path = $$LIB_DIR/qmmp/General
+    target.path = $$PLUGIN_DIR/General
     INSTALLS += target
 }
diff --git a/src/plugins/General/streambrowser/streambrowser.pro b/src/plugins/General/streambrowser/streambrowser.pro
index 75680c8fb..77d550055 100644
--- a/src/plugins/General/streambrowser/streambrowser.pro
+++ b/src/plugins/General/streambrowser/streambrowser.pro
@@ -19,6 +19,6 @@ RESOURCES = translations/translations.qrc
 LIBS += $$QMMPUI_LIB
 
 unix {
-  target.path = $$LIB_DIR/qmmp/General
+  target.path = $$PLUGIN_DIR/General
   INSTALLS += target
 }
diff --git a/src/plugins/General/trackchange/trackchange.pro b/src/plugins/General/trackchange/trackchange.pro
index f5b0264e1..af10e745b 100644
--- a/src/plugins/General/trackchange/trackchange.pro
+++ b/src/plugins/General/trackchange/trackchange.pro
@@ -14,7 +14,7 @@ win32 : LIBS += -lqmmpui0 -lqmmp0
 
 RESOURCES = translations/translations.qrc
 unix {
-    target.path = $$LIB_DIR/qmmp/General
+    target.path = $$PLUGIN_DIR/General
     INSTALLS += target
 }
 HEADERS += trackchangefactory.h \
diff --git a/src/plugins/General/udisks2/udisks2.pro b/src/plugins/General/udisks2/udisks2.pro
index 86f08b3b9..8b49d9dc5 100644
--- a/src/plugins/General/udisks2/udisks2.pro
+++ b/src/plugins/General/udisks2/udisks2.pro
@@ -22,5 +22,5 @@ RESOURCES = translations/translations.qrc
 
 LIBS += $$QMMPUI_LIB
 
-target.path = $$LIB_DIR/qmmp/General
+target.path = $$PLUGIN_DIR/General
 INSTALLS += target
diff --git a/src/plugins/Input/aac/aac.pro b/src/plugins/Input/aac/aac.pro
index cb61768b3..5be2bf90a 100644
--- a/src/plugins/Input/aac/aac.pro
+++ b/src/plugins/Input/aac/aac.pro
@@ -18,5 +18,5 @@ LIBS += -lfaad \
     -I/usr/include
 PKGCONFIG += taglib
 
-target.path = $$LIB_DIR/qmmp/Input
+target.path = $$PLUGIN_DIR/Input
 INSTALLS += target
diff --git a/src/plugins/Input/archive/archive.pro b/src/plugins/Input/archive/archive.pro
index 0659c072e..a96f0e6b7 100644
--- a/src/plugins/Input/archive/archive.pro
+++ b/src/plugins/Input/archive/archive.pro
@@ -19,7 +19,7 @@ SOURCES += \
 RESOURCES = translations/translations.qrc
 
 unix {
-    target.path = $$LIB_DIR/qmmp/Input
+    target.path = $$PLUGIN_DIR/Input
     INSTALLS += target
     PKGCONFIG += libarchive taglib
 }
diff --git a/src/plugins/Input/cdaudio/cdaudio.pro b/src/plugins/Input/cdaudio/cdaudio.pro
index c6c49838a..f93de73ee 100644
--- a/src/plugins/Input/cdaudio/cdaudio.pro
+++ b/src/plugins/Input/cdaudio/cdaudio.pro
@@ -17,7 +17,7 @@ RESOURCES = translations/translations.qrc
 unix {
   LIBS += -L/usr/lib  -I/usr/include
   PKGCONFIG += libcdio libcdio_cdda libcdio_paranoia libcddb
-  target.path = $$LIB_DIR/qmmp/Input
+  target.path = $$PLUGIN_DIR/Input
   INSTALLS += target
 }
 
diff --git a/src/plugins/Input/cue/cue.pro b/src/plugins/Input/cue/cue.pro
index d97965f30..e4ddd656b 100644
--- a/src/plugins/Input/cue/cue.pro
+++ b/src/plugins/Input/cue/cue.pro
@@ -24,6 +24,6 @@ contains(CONFIG, WITH_ENCA) {
     win32:LIBS += -lenca.dll
 }
 unix {
-    target.path = $$LIB_DIR/qmmp/Input
+    target.path = $$PLUGIN_DIR/Input
     INSTALLS += target
 }
diff --git a/src/plugins/Input/ffmpeg/ffmpeg.pro b/src/plugins/Input/ffmpeg/ffmpeg.pro
index cd34648b0..6167c1eaf 100644
--- a/src/plugins/Input/ffmpeg/ffmpeg.pro
+++ b/src/plugins/Input/ffmpeg/ffmpeg.pro
@@ -21,7 +21,7 @@ RESOURCES = translations/translations.qrc
 DEFINES += __STDC_CONSTANT_MACROS
 
 unix {
-    target.path = $$LIB_DIR/qmmp/Input
+    target.path = $$PLUGIN_DIR/Input
     INSTALLS += target
     PKGCONFIG += libavcodec libavformat libavutil
 }
diff --git a/src/plugins/Input/flac/flac.pro b/src/plugins/Input/flac/flac.pro
index 70c2c7280..298f03225 100644
--- a/src/plugins/Input/flac/flac.pro
+++ b/src/plugins/Input/flac/flac.pro
@@ -15,7 +15,7 @@ SOURCES += decoder_flac.cpp \
 RESOURCES = translations/translations.qrc
 
 unix {
-    target.path = $$LIB_DIR/qmmp/Input
+    target.path = $$PLUGIN_DIR/Input
     INSTALLS += target
     PKGCONFIG += taglib flac
 }
diff --git a/src/plugins/Input/gme/gme.pro b/src/plugins/Input/gme/gme.pro
index e639a13ef..f28c5d7b6 100644
--- a/src/plugins/Input/gme/gme.pro
+++ b/src/plugins/Input/gme/gme.pro
@@ -17,7 +17,7 @@ FORMS += settingsdialog.ui
 RESOURCES = translations/translations.qrc
 
 unix{
-    target.path = $$LIB_DIR/qmmp/Input
+    target.path = $$PLUGIN_DIR/Input
     INSTALLS += target
     LIBS += -L/usr/lib \
       -L/usr/local/lib \
diff --git a/src/plugins/Input/modplug/modplug.pro b/src/plugins/Input/modplug/modplug.pro
index 2ad23a20a..5ceec7258 100644
--- a/src/plugins/Input/modplug/modplug.pro
+++ b/src/plugins/Input/modplug/modplug.pro
@@ -22,7 +22,7 @@ DEFINES += HAVE_STDINT_H \
     HAVE_INTTYPES_H
 
 unix {
-    target.path = $$LIB_DIR/qmmp/Input
+    target.path = $$PLUGIN_DIR/Input
     INSTALLS += target
     PKGCONFIG += libmodplug
 }
diff --git a/src/plugins/Input/mpc/mpc.pro b/src/plugins/Input/mpc/mpc.pro
index dca0637e3..52a10fcb0 100644
--- a/src/plugins/Input/mpc/mpc.pro
+++ b/src/plugins/Input/mpc/mpc.pro
@@ -14,7 +14,7 @@ SOURCES += decoder_mpc.cpp \
 RESOURCES = translations/translations.qrc
 
 unix {
-    target.path = $$LIB_DIR/qmmp/Input
+    target.path = $$PLUGIN_DIR/Input
     INSTALLS += target
     PKGCONFIG += taglib
     LIBS += -lmpcdec -I/usr/include
diff --git a/src/plugins/Input/mpeg/mpeg.pro b/src/plugins/Input/mpeg/mpeg.pro
index 795abf516..7452fde7b 100644
--- a/src/plugins/Input/mpeg/mpeg.pro
+++ b/src/plugins/Input/mpeg/mpeg.pro
@@ -29,7 +29,7 @@ FORMS += settingsdialog.ui
 RESOURCES = translations/translations.qrc
 
 unix {
-    target.path = $$LIB_DIR/qmmp/Input
+    target.path = $$PLUGIN_DIR/Input
     INSTALLS += target
     PKGCONFIG += taglib
     contains(CONFIG, WITH_MAD):PKGCONFIG += mad
diff --git a/src/plugins/Input/opus/opus.pro b/src/plugins/Input/opus/opus.pro
index bb78a15f1..61330cb37 100644
--- a/src/plugins/Input/opus/opus.pro
+++ b/src/plugins/Input/opus/opus.pro
@@ -13,7 +13,7 @@ SOURCES += decoder_opus.cpp \
 RESOURCES = translations/translations.qrc
 
 unix {
-    target.path = $$LIB_DIR/qmmp/Input
+    target.path = $$PLUGIN_DIR/Input
     INSTALLS += target
     PKGCONFIG += taglib opus opusfile
 }
diff --git a/src/plugins/Input/sid/sid.pro b/src/plugins/Input/sid/sid.pro
index 49402f136..08d9f1eaf 100644
--- a/src/plugins/Input/sid/sid.pro
+++ b/src/plugins/Input/sid/sid.pro
@@ -17,7 +17,7 @@ RESOURCES = translations/translations.qrc
 FORMS += settingsdialog.ui
 
 unix{
-    target.path = $$LIB_DIR/qmmp/Input
+    target.path = $$PLUGIN_DIR/Input
     INSTALLS += target
     PKGCONFIG += libsidplayfp
 }
diff --git a/src/plugins/Input/sndfile/sndfile.pro b/src/plugins/Input/sndfile/sndfile.pro
index 389fbc21c..4a6a40378 100644
--- a/src/plugins/Input/sndfile/sndfile.pro
+++ b/src/plugins/Input/sndfile/sndfile.pro
@@ -11,7 +11,7 @@ SOURCES += decoder_sndfile.cpp \
 RESOURCES = translations/translations.qrc
 
 unix {
-    target.path = $$LIB_DIR/qmmp/Input
+    target.path = $$PLUGIN_DIR/Input
     INSTALLS += target
     PKGCONFIG += sndfile
 }
diff --git a/src/plugins/Input/vorbis/vorbis.pro b/src/plugins/Input/vorbis/vorbis.pro
index 8d3b683c7..4b8a32ee6 100644
--- a/src/plugins/Input/vorbis/vorbis.pro
+++ b/src/plugins/Input/vorbis/vorbis.pro
@@ -13,7 +13,7 @@ SOURCES += decoder_vorbis.cpp \
 RESOURCES = translations/translations.qrc
 
 unix {
-    target.path = $$LIB_DIR/qmmp/Input
+    target.path = $$PLUGIN_DIR/Input
     INSTALLS += target
     PKGCONFIG += taglib ogg vorbisfile vorbis
 }
diff --git a/src/plugins/Input/wavpack/wavpack.pro b/src/plugins/Input/wavpack/wavpack.pro
index b398b3cc6..d08d4141c 100644
--- a/src/plugins/Input/wavpack/wavpack.pro
+++ b/src/plugins/Input/wavpack/wavpack.pro
@@ -16,7 +16,7 @@ SOURCES += decoder_wavpack.cpp \
 RESOURCES = translations/translations.qrc
 
 unix {
-    target.path = $$LIB_DIR/qmmp/Input
+    target.path = $$PLUGIN_DIR/Input
     INSTALLS += target
     PKGCONFIG += wavpack
 }
diff --git a/src/plugins/Input/wildmidi/wildmidi.pro b/src/plugins/Input/wildmidi/wildmidi.pro
index 073baf5da..980a329a4 100644
--- a/src/plugins/Input/wildmidi/wildmidi.pro
+++ b/src/plugins/Input/wildmidi/wildmidi.pro
@@ -20,5 +20,5 @@ LIBS += -L/usr/lib \
     -I/usr/include \
     -lWildMidi
 
-target.path = $$LIB_DIR/qmmp/Input
+target.path = $$PLUGIN_DIR/Input
 INSTALLS += target
diff --git a/src/plugins/Output/alsa/alsa.pro b/src/plugins/Output/alsa/alsa.pro
index 5e5b01322..82ceff031 100644
--- a/src/plugins/Output/alsa/alsa.pro
+++ b/src/plugins/Output/alsa/alsa.pro
@@ -15,5 +15,5 @@ RESOURCES = translations/translations.qrc
 
 PKGCONFIG += alsa
 
-target.path = $$LIB_DIR/qmmp/Output
+target.path = $$PLUGIN_DIR/Output
 INSTALLS += target
diff --git a/src/plugins/Output/directsound/directsound.pro b/src/plugins/Output/directsound/directsound.pro
index 3c2c9843c..8f730540a 100644
--- a/src/plugins/Output/directsound/directsound.pro
+++ b/src/plugins/Output/directsound/directsound.pro
@@ -12,5 +12,5 @@ RESOURCES = translations/translations.qrc
 
 LIBS += -ldxguid -lstrmiids -ldmoguids -lmsdmo -lole32 -loleaut32 -luuid -lgdi32 -ldsound -lksuser
 
-target.path = $$LIB_DIR/qmmp/Output
+target.path = $$PLUGIN_DIR/Output
 INSTALLS += target
diff --git a/src/plugins/Output/jack/jack.pro b/src/plugins/Output/jack/jack.pro
index b5f5369e8..2fbb01c99 100644
--- a/src/plugins/Output/jack/jack.pro
+++ b/src/plugins/Output/jack/jack.pro
@@ -14,5 +14,5 @@ RESOURCES = translations/translations.qrc
 
 PKGCONFIG += jack soxr
 
-target.path = $$LIB_DIR/qmmp/Output
+target.path = $$PLUGIN_DIR/Output
 INSTALLS += target
diff --git a/src/plugins/Output/null/null.pro b/src/plugins/Output/null/null.pro
index bd4e424a6..efb633f3b 100644
--- a/src/plugins/Output/null/null.pro
+++ b/src/plugins/Output/null/null.pro
@@ -11,6 +11,6 @@ SOURCES += outputnullfactory.cpp \
 RESOURCES = translations/translations.qrc
 
 unix {
-    target.path = $$LIB_DIR/qmmp/Output
+    target.path = $$PLUGIN_DIR/Output
     INSTALLS += target
 }
diff --git a/src/plugins/Output/oss/oss.pro b/src/plugins/Output/oss/oss.pro
index d497d6207..68d67bc48 100644
--- a/src/plugins/Output/oss/oss.pro
+++ b/src/plugins/Output/oss/oss.pro
@@ -16,5 +16,5 @@ RESOURCES = translations/translations.qrc
 
 DEFINES += HAVE_SYS_SOUNDCARD_H
 
-target.path = $$LIB_DIR/qmmp/Output
+target.path = $$PLUGIN_DIR/Output
 INSTALLS += target
diff --git a/src/plugins/Output/oss4/oss4.pro b/src/plugins/Output/oss4/oss4.pro
index 26076e918..0d81a249d 100644
--- a/src/plugins/Output/oss4/oss4.pro
+++ b/src/plugins/Output/oss4/oss4.pro
@@ -16,5 +16,5 @@ RESOURCES = translations/translations.qrc
 
 DEFINES += HAVE_SYS_SOUNDCARD_H
 
-target.path = $$LIB_DIR/qmmp/Output
+target.path = $$PLUGIN_DIR/Output
 INSTALLS += target
diff --git a/src/plugins/Output/pulseaudio/pulseaudio.pro b/src/plugins/Output/pulseaudio/pulseaudio.pro
index 1487fb347..623679b3f 100644
--- a/src/plugins/Output/pulseaudio/pulseaudio.pro
+++ b/src/plugins/Output/pulseaudio/pulseaudio.pro
@@ -12,5 +12,5 @@ RESOURCES = translations/translations.qrc
 
 PKGCONFIG += libpulse-simple
 
-target.path = $$LIB_DIR/qmmp/Output
+target.path = $$PLUGIN_DIR/Output
 INSTALLS += target
diff --git a/src/plugins/Output/qtmultimedia/qtmultimedia.pro b/src/plugins/Output/qtmultimedia/qtmultimedia.pro
index f5afd0e58..9278bc347 100644
--- a/src/plugins/Output/qtmultimedia/qtmultimedia.pro
+++ b/src/plugins/Output/qtmultimedia/qtmultimedia.pro
@@ -17,6 +17,6 @@ SOURCES += outputqtmultimediafactory.cpp \
 RESOURCES = translations/translations.qrc
 
 unix {
-    target.path = $$LIB_DIR/qmmp/Output
+    target.path = $$PLUGIN_DIR/Output
     INSTALLS += target
 }
diff --git a/src/plugins/Output/shout/shout.pro b/src/plugins/Output/shout/shout.pro
index 939f5ad3f..0579cad1a 100644
--- a/src/plugins/Output/shout/shout.pro
+++ b/src/plugins/Output/shout/shout.pro
@@ -17,7 +17,7 @@ FORMS += settingsdialog.ui
 RESOURCES = translations/translations.qrc
 
 unix {
-    target.path = $$LIB_DIR/qmmp/Output
+    target.path = $$PLUGIN_DIR/Output
     INSTALLS += target
     PKGCONFIG += ogg vorbis vorbisenc shout soxr
 }
diff --git a/src/plugins/Output/wasapi/wasapi.pro b/src/plugins/Output/wasapi/wasapi.pro
index d66c9f8c0..e40dc88a4 100644
--- a/src/plugins/Output/wasapi/wasapi.pro
+++ b/src/plugins/Output/wasapi/wasapi.pro
@@ -14,7 +14,7 @@ RESOURCES = translations/translations.qrc
 

 LIBS += -lstrmiids -ldmoguids -lmsdmo -lole32 -loleaut32 -luuid -lgdi32 -lksuser

 

-target.path = $$LIB_DIR/qmmp/Output

+target.path = $$PLUGIN_DIR/Output

 INSTALLS += target

 

 FORMS += \

diff --git a/src/plugins/Output/waveout/waveout.pro b/src/plugins/Output/waveout/waveout.pro
index 86485d90b..42523fe58 100644
--- a/src/plugins/Output/waveout/waveout.pro
+++ b/src/plugins/Output/waveout/waveout.pro
@@ -12,5 +12,5 @@ RESOURCES = translations/translations.qrc
 
 LIBS += -lwinmm
 
-target.path = $$LIB_DIR/qmmp/Output
+target.path = $$PLUGIN_DIR/Output
 INSTALLS += target
diff --git a/src/plugins/PlayListFormats/m3u/m3u.pro b/src/plugins/PlayListFormats/m3u/m3u.pro
index ae66c0556..a70c5d88e 100644
--- a/src/plugins/PlayListFormats/m3u/m3u.pro
+++ b/src/plugins/PlayListFormats/m3u/m3u.pro
@@ -9,6 +9,6 @@ SOURCES += m3uplaylistformat.cpp
 LIBS += $$QMMPUI_LIB
 
 unix {
-    target.path = $$LIB_DIR/qmmp/PlayListFormats
+    target.path = $$PLUGIN_DIR/PlayListFormats
     INSTALLS += target
 }
diff --git a/src/plugins/PlayListFormats/pls/pls.pro b/src/plugins/PlayListFormats/pls/pls.pro
index 6e5b160b0..104f1fff5 100644
--- a/src/plugins/PlayListFormats/pls/pls.pro
+++ b/src/plugins/PlayListFormats/pls/pls.pro
@@ -9,6 +9,6 @@ HEADERS += plsplaylistformat.h
 LIBS += $$QMMPUI_LIB
 
 unix {
-    target.path = $$LIB_DIR/qmmp/PlayListFormats
+    target.path = $$PLUGIN_DIR/PlayListFormats
     INSTALLS += target
 }
diff --git a/src/plugins/PlayListFormats/xspf/xspf.pro b/src/plugins/PlayListFormats/xspf/xspf.pro
index 5dd274e61..f22b89bf3 100644
--- a/src/plugins/PlayListFormats/xspf/xspf.pro
+++ b/src/plugins/PlayListFormats/xspf/xspf.pro
@@ -9,6 +9,6 @@ HEADERS += xspfplaylistformat.h
 LIBS += $$QMMPUI_LIB
 
 unix {
-    target.path = $$LIB_DIR/qmmp/PlayListFormats
+    target.path = $$PLUGIN_DIR/PlayListFormats
     INSTALLS += target
 }
diff --git a/src/plugins/Transports/http/http.pro b/src/plugins/Transports/http/http.pro
index 10d47d16f..20830e93c 100644
--- a/src/plugins/Transports/http/http.pro
+++ b/src/plugins/Transports/http/http.pro
@@ -27,7 +27,7 @@ contains(CONFIG, WITH_ENCA){
 unix {
     LIBS += -L/usr/lib
     PKGCONFIG += libcurl
-    target.path = $$LIB_DIR/qmmp/Transports
+    target.path = $$PLUGIN_DIR/Transports
     INSTALLS += target
 }
 win32 {
diff --git a/src/plugins/Transports/mms/mms.pro b/src/plugins/Transports/mms/mms.pro
index f31d50727..5d3ee39fb 100644
--- a/src/plugins/Transports/mms/mms.pro
+++ b/src/plugins/Transports/mms/mms.pro
@@ -21,7 +21,7 @@ RESOURCES = translations/translations.qrc
 LIBS += -L/usr/lib
 PKGCONFIG += libmms
 
-target.path = $$LIB_DIR/qmmp/Transports
+target.path = $$PLUGIN_DIR/Transports
 INSTALLS += target
 
 QMAKE_CFLAGS_ISYSTEM='' #removes "-isystem /usr/include"  provided by libmms.pc
diff --git a/src/plugins/Ui/qsui/qsui.pro b/src/plugins/Ui/qsui/qsui.pro
index dc51cbcc0..380b40a0e 100644
--- a/src/plugins/Ui/qsui/qsui.pro
+++ b/src/plugins/Ui/qsui/qsui.pro
@@ -80,7 +80,7 @@ RESOURCES += translations/translations.qrc resources/qsui_resources.qrc txt/qsui
 LIBS += $$QMMPUI_LIB
 
 unix {
-  target.path = $$LIB_DIR/qmmp/Ui
+  target.path = $$PLUGIN_DIR/Ui
   INSTALLS += target
 }
 
diff --git a/src/plugins/Ui/skinned/skinned.pro b/src/plugins/Ui/skinned/skinned.pro
index 9e55ab2d0..554b414e3 100644
--- a/src/plugins/Ui/skinned/skinned.pro
+++ b/src/plugins/Ui/skinned/skinned.pro
@@ -122,7 +122,7 @@ RESOURCES = resources/resources.qrc \
 LIBS += $$QMMPUI_LIB
 
 unix {
-    target.path = $$LIB_DIR/qmmp/Ui
+    target.path = $$PLUGIN_DIR/Ui
     INSTALLS += target
     PKGCONFIG += x11
     DEFINES += QMMP_WS_X11
diff --git a/src/plugins/Visual/analyzer/analyzer.pro b/src/plugins/Visual/analyzer/analyzer.pro
index 6db4fecd7..c354c17eb 100644
--- a/src/plugins/Visual/analyzer/analyzer.pro
+++ b/src/plugins/Visual/analyzer/analyzer.pro
@@ -19,7 +19,7 @@ FORMS += settingsdialog.ui
 RESOURCES = translations/translations.qrc
 
 unix{
-   target.path = $$LIB_DIR/qmmp/Visual
+   target.path = $$PLUGIN_DIR/Visual
    INSTALLS += target
 }
 
diff --git a/src/plugins/Visual/projectm/projectm.pro b/src/plugins/Visual/projectm/projectm.pro
index 5ee0c5f4f..171650a78 100644
--- a/src/plugins/Visual/projectm/projectm.pro
+++ b/src/plugins/Visual/projectm/projectm.pro
@@ -15,7 +15,7 @@ RESOURCES = translations/translations.qrc
 
 unix {
     PKGCONFIG += libprojectM
-    target.path = $$LIB_DIR/qmmp/Visual
+    target.path = $$PLUGIN_DIR/Visual
     INSTALLS += target
     LIBS += -L/usr/lib -I/usr/include
     #projectM config path
diff --git a/src/plugins/plugins.pri b/src/plugins/plugins.pri
index 7ca50ed3c..09995a399 100644
--- a/src/plugins/plugins.pri
+++ b/src/plugins/plugins.pri
@@ -10,9 +10,6 @@ win32 {
 }
 
 unix {
-    isEmpty(LIB_DIR){
-        LIB_DIR = /lib
-    }
     PLUGINS_PREFIX=../../../../lib/qmmp
     LIBS += -lqmmp
     QMMPUI_LIB = -lqmmpui
diff --git a/src/qmmp/qmmp.pro b/src/qmmp/qmmp.pro
index f67045e72..c7a9ec0b5 100644
--- a/src/qmmp/qmmp.pro
+++ b/src/qmmp/qmmp.pro
@@ -88,7 +88,6 @@ VERSION = $$QMMP_VERSION
 DEFINES += QMMP_LIBRARY
 
 unix {
-  isEmpty(LIB_DIR):LIB_DIR = /lib
   DEFINES += LIB_DIR=\\\"$$LIB_DIR\\\"
   SVN_REVISION = $$system(./svn_revision.sh)
   !isEmpty(SVN_REVISION) {
@@ -138,7 +137,7 @@ unix {
         volume.h \
         qmmp_export.h
 
-    devel.path = /include/qmmp
+    devel.path = $$PREFIX/include/qmmp
     INSTALLS += target \
         devel
     DESTDIR = .
diff --git a/src/qmmpui/qmmpui.pro b/src/qmmpui/qmmpui.pro
index ae340ee22..b84398483 100644
--- a/src/qmmpui/qmmpui.pro
+++ b/src/qmmpui/qmmpui.pro
@@ -17,7 +17,6 @@ QMAKE_LIBDIR += ../../lib \
 unix {
     TARGET = ../../lib/qmmpui
     LIBS += -L../../lib -lqmmp
-    isEmpty(LIB_DIR):LIB_DIR = /lib
     target.path = $$LIB_DIR
 }
 
@@ -173,7 +172,7 @@ unix {
     metadataformattermenu.h \
     qmmpui_export.h
 
-    devel.path = /include/qmmpui
+    devel.path = $$PREFIX/include/qmmpui
     INSTALLS += target \
         devel
 }