summaryrefslogtreecommitdiff
path: root/libraries
diff options
context:
space:
mode:
authorB. Watson <yalhcru@gmail.com>2017-03-20 05:15:34 -0400
committerDavid Spencer <idlemoor@slackbuilds.org>2017-03-25 13:26:46 +0000
commitcb19e91cdbe93c8aae7ed6f4a3f470497d9053e3 (patch)
treedeacd7e4d0bf15a93d849a48d970e6264b2f4490 /libraries
parentc5098156622cb904955a37eafae5d16b73c1aa09 (diff)
downloadslackbuilds-cb19e91cdbe93c8aae7ed6f4a3f470497d9053e3.tar.gz
libraries/libopenraw: Remove unused doinst.sh, i486=>i586.
Signed-off-by: B. Watson <yalhcru@gmail.com> Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
Diffstat (limited to 'libraries')
-rw-r--r--libraries/libopenraw/doinst.sh24
-rw-r--r--libraries/libopenraw/libopenraw.SlackBuild6
2 files changed, 3 insertions, 27 deletions
diff --git a/libraries/libopenraw/doinst.sh b/libraries/libopenraw/doinst.sh
deleted file mode 100644
index 234ad26971..0000000000
--- a/libraries/libopenraw/doinst.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-config() {
- NEW="$1"
- OLD="$(dirname $NEW)/$(basename $NEW .new)"
- # If there's no config file by that name, mv it over:
- if [ ! -r $OLD ]; then
- mv $NEW $OLD
- elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
- # toss the redundant copy
- rm $NEW
- fi
- # Otherwise, we leave the .new copy for the admin to consider...
-}
-
-config etc/$PRGNAM.conf.new
-
-if [ -x usr/bin/update-desktop-database ]; then
- usr/bin/update-desktop-database -q usr/share/applications
-fi
-
-if [ -x usr/bin/update-mime-database ]; then
- usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
-fi
diff --git a/libraries/libopenraw/libopenraw.SlackBuild b/libraries/libopenraw/libopenraw.SlackBuild
index c35a8b6e27..14bd615166 100644
--- a/libraries/libopenraw/libopenraw.SlackBuild
+++ b/libraries/libopenraw/libopenraw.SlackBuild
@@ -30,7 +30,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
@@ -41,8 +41,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"