summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Matteo Bernardini2013-11-26 17:27:50 +0100
committer Robby Workman2013-11-28 07:13:11 +0100
commit114b7c7af8338af42bfce2efde7344c6e3e467b1 (patch)
tree80279ef03de7ce5a1b5c97c1ae7232248e388c85
parent8fda0c84c75c0cbfe48dc380f6b726194b0e0398 (diff)
downloadslackbuilds-114b7c7af8338af42bfce2efde7344c6e3e467b1.tar.gz
development/mysql-workbench: Respect $LIBDIRSUFFIX.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
-rw-r--r--development/mysql-workbench/mysql-workbench.SlackBuild8
1 files changed, 3 insertions, 5 deletions
diff --git a/development/mysql-workbench/mysql-workbench.SlackBuild b/development/mysql-workbench/mysql-workbench.SlackBuild
index 1f2741e3fb..e28e8db0fd 100644
--- a/development/mysql-workbench/mysql-workbench.SlackBuild
+++ b/development/mysql-workbench/mysql-workbench.SlackBuild
@@ -3,7 +3,7 @@
# Slackware build script for mysql-workbench
# Originally written by André Geraldo Vieira <andre.geraldo@gmail.com>
-# Copyright 2013 Willy Sudiarto Raharjo <willysr@slackware-id.org>
+# Copyright 2013 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -72,9 +72,6 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-
# Patch from Ponce
patch -p1 < $CWD/config_and_ifconfig_paths.patch
@@ -84,6 +81,7 @@ cmake \
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_INSTALL_PREFIX=/usr \
+ -DLIB_INSTALL_DIR=/usr/lib$LIBDIRSUFFIX \
-DCMAKE_BUILD_TYPE=Release ..
make
@@ -93,7 +91,7 @@ touch $TMP/$PRGNAM-community-$SRCVERSION/LICENSE.mysql
make install DESTDIR=$PKG
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+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
cd ..