summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author David Melik <dchmelik@gmail.com>2016-08-22 13:25:49 +0100
committer David Spencer <idlemoor@slackbuilds.org>2016-08-28 00:22:59 +0100
commitaf3592becd3e510aadd6ada54fae4c96c1b04c5f (patch)
treed0a8d419233f7ad25db6b886b97f0e103815b0d2
parent5649a3bcacf494fd1c3de4f9a5278902726e9c0d (diff)
downloadslackbuilds-af3592becd3e510aadd6ada54fae4c96c1b04c5f.tar.gz
slackbuilds-af3592becd3e510aadd6ada54fae4c96c1b04c5f.tar.xz
libraries/grx: i486 -> i586.
Moved the static library to /usr/lib64 on 64 bit. Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
-rw-r--r--libraries/grx/grx.SlackBuild11
1 files changed, 6 insertions, 5 deletions
diff --git a/libraries/grx/grx.SlackBuild b/libraries/grx/grx.SlackBuild
index b7396ad5b4..2eee534673 100644
--- a/libraries/grx/grx.SlackBuild
+++ b/libraries/grx/grx.SlackBuild
@@ -29,7 +29,7 @@ TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -85,10 +85,11 @@ find . -type f -exec sed -i "s,-O2,$SLKCFLAGS,g" {} \;
$EXTRAOPTS
make
-
-mkdir -p $PKG/usr/lib${LIBDIRSUFFIX} $PKG/usr/include
make install INSTALLDIR="$PKG/usr" DESTDIR="$PKG"
+# move the static library to the right place
+[ -n "$LIBDIRSUFFIX" ] && mv $PKG/usr/lib $PKG/usr/lib$LIBDIRSUFFIX
+
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -ar copying* doc/* readme $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild