From 7dd7c511c94bfe160d09dda1c5651d61e3a87c10 Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
Date: Wed, 29 May 2013 07:50:50 +0000
Subject: fixed qmake support (patch by Ryota Shimamoto) (Fixes issue 586)

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@3493 90c681e8-e032-0410-971d-27865f9a5e38
---
 src/plugins/General/kdenotify/kdenotify.pro | 4 ++--
 src/plugins/PlayListFormats/m3u/m3u.pro     | 4 ++--
 src/plugins/PlayListFormats/pls/pls.pro     | 2 +-
 src/plugins/PlayListFormats/xspf/xspf.pro   | 4 ++--
 src/plugins/plugins.pri                     | 1 +
 5 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'src/plugins')

diff --git a/src/plugins/General/kdenotify/kdenotify.pro b/src/plugins/General/kdenotify/kdenotify.pro
index 840a9c67c..6d70f2cf1 100644
--- a/src/plugins/General/kdenotify/kdenotify.pro
+++ b/src/plugins/General/kdenotify/kdenotify.pro
@@ -42,7 +42,7 @@ TRANSLATIONS = translations/kdenotify_plugin_cs.ts \
                translations/kdenotify_plugin_ja.ts \
                translations/kdenotify_plugin_es.ts
 
-images.files = app_icon.png \
-               empty_cover.png
+images.files = images/app_icon.png \
+               images/empty_cover.png
 images.path = /share/qmmp/images/
 INSTALLS += images
diff --git a/src/plugins/PlayListFormats/m3u/m3u.pro b/src/plugins/PlayListFormats/m3u/m3u.pro
index 63a6566af..b275eaa7d 100644
--- a/src/plugins/PlayListFormats/m3u/m3u.pro
+++ b/src/plugins/PlayListFormats/m3u/m3u.pro
@@ -19,10 +19,10 @@ unix {
     isEmpty(LIB_DIR){
         LIB_DIR = /lib
     }
-    target.path = $$LIB_DIR/qmmp/PlaylistFormats
+    target.path = $$LIB_DIR/qmmp/PlayListFormats
     INSTALLS += target
 
-    QMAKE_CLEAN =$$PLUGINS_PREFIX/General/libm3uplaylistformat.so
+    QMAKE_CLEAN =$$PLUGINS_PREFIX/PlayListFormats/libm3uplaylistformat.so
     LIBS += -lqmmpui
 }
 
diff --git a/src/plugins/PlayListFormats/pls/pls.pro b/src/plugins/PlayListFormats/pls/pls.pro
index b3e723d64..553220d37 100644
--- a/src/plugins/PlayListFormats/pls/pls.pro
+++ b/src/plugins/PlayListFormats/pls/pls.pro
@@ -20,7 +20,7 @@ unix {
     isEmpty(LIB_DIR){
         LIB_DIR = /lib
     }
-    target.path = $$LIB_DIR/qmmp/PlaylistFormats
+    target.path = $$LIB_DIR/qmmp/PlayListFormats
     INSTALLS += target
 
     QMAKE_CLEAN =$$PLUGINS_PREFIX/PlayListFormats/plsplaylistformat.so
diff --git a/src/plugins/PlayListFormats/xspf/xspf.pro b/src/plugins/PlayListFormats/xspf/xspf.pro
index 01c2eecfa..a7ca309b5 100644
--- a/src/plugins/PlayListFormats/xspf/xspf.pro
+++ b/src/plugins/PlayListFormats/xspf/xspf.pro
@@ -21,10 +21,10 @@ unix {
     isEmpty(LIB_DIR){
         LIB_DIR = /lib
     }
-    target.path = $$LIB_DIR/qmmp/PlaylistFormats
+    target.path = $$LIB_DIR/qmmp/PlayListFormats
     INSTALLS += target
 
-    QMAKE_CLEAN =$$PLUGINS_PREFIX/PlaylistFormats/libxsplaylistformat.so
+    QMAKE_CLEAN =$$PLUGINS_PREFIX/PlayListFormats/libxsplaylistformat.so
     LIBS += -lqmmpui -lqmmp
 }
 
diff --git a/src/plugins/plugins.pri b/src/plugins/plugins.pri
index 5c7a674a0..27608e92c 100644
--- a/src/plugins/plugins.pri
+++ b/src/plugins/plugins.pri
@@ -1,3 +1,4 @@
 include(../../qmmp.pri)
 unix:PLUGINS_PREFIX=../../../../lib/qmmp
 win32:PLUGINS_PREFIX=../../../../../bin/plugins
+INCLUDEPATH += ../../../qmmp
-- 
cgit v1.2.3-13-gbd6f