From a587e861130779f2e9c761506e3e9570c438a1a0 Mon Sep 17 00:00:00 2001
From: NK <nk-man@yandex.ru>
Date: Mon, 23 Mar 2015 09:37:35 +0100
Subject: graphics/screengrab: Fix libraries installation path, cleanups.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
---
 graphics/screengrab/screengrab.SlackBuild | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'graphics/screengrab')

diff --git a/graphics/screengrab/screengrab.SlackBuild b/graphics/screengrab/screengrab.SlackBuild
index d4385eb5f6..33aedaac88 100644
--- a/graphics/screengrab/screengrab.SlackBuild
+++ b/graphics/screengrab/screengrab.SlackBuild
@@ -23,7 +23,7 @@
 
 PRGNAM=screengrab
 VERSION=${VERSION:-1.2.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -40,7 +40,6 @@ PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 IS64BITS=0
-RESPECTLIB64=0
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -49,8 +48,8 @@ elif [ "$ARCH" = "i686" ]; then
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
   IS64BITS=1
-  RESPECTLIB64=1
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
@@ -77,8 +76,8 @@ cd build
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib$LIBDIRSUFFIX \
     -DIS64BITS=$IS64BITS \
-    -DRESPECTLIB64=$RESPECTLIB64 \
     -DCMAKE_BUILD_TYPE=Release ..
   make
   make install DESTDIR=$PKG
@@ -90,6 +89,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 # move the docs in slackware standard location
 mkdir $PKG/usr/doc
 mv $PKG/usr/share/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION
+rmdir $PKG/usr/share/doc
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
-- 
cgit v1.2.3