1 files changed, 28 insertions, 16 deletions
diff --git a/network/mumble/mumble.SlackBuild b/network/mumble/mumble.SlackBuild
index 2b2c0019d1..65782e9da1 100644
--- a/network/mumble/mumble.SlackBuild
+++ b/network/mumble/mumble.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=mumble
 VERSION=${VERSION:-1.2.3}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -84,8 +84,8 @@ find . \
  -exec chmod 644 {} \;
 
 qmake \
-  main.pro \
   -recursive \
+  main.pro \
   DEFINES*="PLUGIN_PATH=/usr/lib${LIBDIRSUFFIX}/mumble" \
   CONFIG+=no-server \
   CONFIG+=no-bundled-celt \
@@ -104,22 +104,34 @@ make release
 mkdir -p \
   $PKG/usr/bin \
   $PKG/usr/lib${LIBDIRSUFFIX}/mumble \
-  $PKG/usr/man \
-  $PKG/usr/share/applications \
-  $PKG/usr/share/pixmaps \
-
-# I don't understand why this is here.  That seems like a good reason to
-# leave it alone, so I will, but I'd like an explanation :-)  --rworkman
-if [ -e $PKG/usr/lib${LIBDIRSUFFIX}/libmumble.so ]; then
-  cp release/libmumble.so* $PKG/usr/lib${LIBDIRSUFFIX}
+  $PKG/usr/man/man1 \
+  $PKG/usr/share/{applications,pixmaps}
+
+install -m 755 \
+  release/mumble release/mumble11x \
+ $PKG/usr/bin
+
+install -m 644 \
+  man/mumble-overlay.1 man/mumble.1 man/mumble11x.1 \
+ $PKG/usr/man/man1
+
+install -m 644 scripts/mumble.desktop $PKG/usr/share/applications
+install -m 644 icons/mumble.xpm $PKG/usr/share/pixmaps
+
+find release/plugins -type f -name *.so \
+  -exec install -m 755 {} $PKG/usr/lib${LIBDIRSUFFIX}/mumble \;
+
+# If the overlay was built, let's install the library for it
+if [ -e release/libmumble.so.$VERSION ]; then
+  install -m 755 release/libmumble.so.$VERSION $PKG/usr/lib${LIBDIRSUFFIX}
+  
+  cd $PKG/usr/lib${LIBDIRSUFFIX}
+    ln -sf libmumble.so.$VERSION libmumble.so.1.2
+    ln -sf libmumble.so.1.2 libmumble.so.1
+    ln -sf libmumble.so.1 libmumble.so
+  cd -
 fi
 
-cp release/plugins/* $PKG/usr/lib${LIBDIRSUFFIX}/mumble
-cp release/mumble release/mumble11x $PKG/usr/bin
-cp man/mumble*.1 $PKG/usr/man
-cp $CWD/*.desktop $PKG/usr/share/applications
-cp $CWD/mumble.xpm $PKG/usr/share/pixmaps
-
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true