1 files changed, 8 insertions, 16 deletions
diff --git a/development/fuel/fuel.SlackBuild b/development/fuel/fuel.SlackBuild
index ca4799a8443ef..1c00e4a59de21 100644
--- a/development/fuel/fuel.SlackBuild
+++ b/development/fuel/fuel.SlackBuild
@@ -2,7 +2,7 @@
 #
 # Slackware build script for fuel.
 #
-# Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# Copyright 2015-2017  Edinaldo P. Silva, Rio de Janeiro, Brazil.
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,12 +24,12 @@
 
 PRGNAM=fuel
 VERSION=${VERSION:-1.0.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 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"
@@ -59,7 +59,7 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-src-$VERSION
+rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
@@ -71,21 +71,13 @@ find -L . \
 
 qmake fuel.pro
 make
-
-install -d $PKG/usr/bin
-install -D -m755 fuel $PKG/usr/bin/fuel
-install -d $PKG/usr/share/applications
-install -D -m644 rsrc/fuel.desktop $PKG/usr/share/applications/fuel.desktop
-install -d /usr/share/icons/hicolor/256x256/apps/
-install -D -m644 rsrc/icons/fuel.png $PKG/usr/share/icons/hicolor/256x256/apps/fuel.png
+make INSTALL_ROOT=$PKG install
 
 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
 
-DOCS="doc/Building.md doc/Changes.md doc/License.txt"
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION/
+cp -a doc/{Building.md,Changes.md,License.txt} $PKG/usr/doc/$PRGNAM-$VERSION/
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install