3 files changed, 13 insertions, 15 deletions
diff --git a/src/qmmp/qmmp.cpp b/src/qmmp/qmmp.cpp
index 0c27ce726..e8f5169dc 100644
--- a/src/qmmp/qmmp.cpp
+++ b/src/qmmp/qmmp.cpp
@@ -28,6 +28,8 @@
 #define LIB_DIR "/lib"
 #endif
 
+#define DEV_SUFFIX "dev"
+
 #include "qmmp.h"
 
 QString Qmmp::m_configFile;
@@ -51,9 +53,9 @@ const QString Qmmp::strVersion()
             .arg(QMMP_VERSION_PATCH);
 #if !QMMP_VERSION_STABLE
 #ifdef SVN_REVISION
-    ver += "-"SVN_REVISION;
+    ver += "-svn-"SVN_REVISION;
 #else
-    ver += "-svn";
+    ver += "-"DEV_SUFFIX;
 #endif
 #endif
     return ver;
diff --git a/src/qmmp/qmmp.pro b/src/qmmp/qmmp.pro
index 02541d060..b9f30e72c 100644
--- a/src/qmmp/qmmp.pro
+++ b/src/qmmp/qmmp.pro
@@ -77,12 +77,14 @@ TEMPLATE = lib
 VERSION = $$QMMP_VERSION
 unix:isEmpty(LIB_DIR):LIB_DIR = /lib
 unix:DEFINES += LIB_DIR=\\\"$$LIB_DIR\\\"
-DEFINES += QMMP_VERSION=$$QMMP_VERSION
-DEFINES += QMMP_STR_VERSION=\\\"$$QMMP_VERSION\\\"
-contains(CONFIG, SVN_VERSION) {
-    unix:DEFINES += SVN_REVISION=\\\"$$system(./svn_revision.sh)\\\"
-    win32:DEFINES += SVN_REVISION=\\\"svn\\\"
+
+unix {
+  SVN_REVISION = $$system(./svn_revision.sh)
+  !isEmpty(SVN_REVISION) {
+    DEFINES += SVN_REVISION=\\\"$$SVN_REVISION\\\"
+  }
 }
+
 unix {
     target.path = $$LIB_DIR
     devel.files += \
diff --git a/src/qmmp/svn_revision.sh b/src/qmmp/svn_revision.sh
index f7b47a482..84d2042ba 100755
--- a/src/qmmp/svn_revision.sh
+++ b/src/qmmp/svn_revision.sh
@@ -4,11 +4,5 @@
 # check for SVN revision number
 MYDIR=$(dirname $0)
 revision=`cd $MYDIR && LC_ALL=C svn info 2> /dev/null | grep Revision | cut -d' ' -f2`
-test $revision || revision=`cd "$1" && grep revision .svn/entries 2>/dev/null | cut -d '"' -f2`
-test $revision || revision=`cd "$1" && sed -n -e '/^dir$/{n;p;q}' .svn/entries 2>/dev/null`
-test $revision && revision=svn-r$revision
-
-# no version number found
-test $revision || revision=svn
-
-echo $revision
+test $revision && revision=r$revision
+test $revision && echo $revision