aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorB. Watson <yalhcru@gmail.com>2017-03-21 15:28:17 -0400
committerDavid Spencer <idlemoor@slackbuilds.org>2017-03-25 13:29:19 +0000
commit66cc3c3fcaae23b7455572a650132fc852faae50 (patch)
tree7c695706dedec1632f6c049d7d956b0bb9b582e0
parent0bb00995507b88220ae4da8aec4bb82d2d012290 (diff)
office/xournal: Remove template comment, i486=>i586.
Signed-off-by: B. Watson <yalhcru@gmail.com> Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
-rw-r--r--office/xournal/xournal.SlackBuild8
1 files changed, 3 insertions, 5 deletions
diff --git a/office/xournal/xournal.SlackBuild b/office/xournal/xournal.SlackBuild
index 6ab7469946deb..a74ddd439ae5e 100644
--- a/office/xournal/xournal.SlackBuild
+++ b/office/xournal/xournal.SlackBuild
@@ -10,7 +10,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
@@ -21,8 +21,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"
@@ -65,7 +65,6 @@ make
make install-strip DESTDIR=$PKG
make desktop-install DESTDIR=$PKG
-# Copy program documentation into the package
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a \
AUTHORS COPYING ChangeLog INSTALL \
@@ -76,6 +75,5 @@ mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
cat $CWD/doinst.sh > $PKG/install/doinst.sh
-# Make the package; be sure to leave it in $OUTPUT
cd $PKG
/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}