1 files changed, 15 insertions, 13 deletions
diff --git a/misc/OSCAR/OSCAR.SlackBuild b/misc/OSCAR/OSCAR.SlackBuild
index 48cf8f56db..eb58726ca5 100644
--- a/misc/OSCAR/OSCAR.SlackBuild
+++ b/misc/OSCAR/OSCAR.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for OSCAR
 
-# Copyright 2019 Zhu, Qun-Ying
+# Copyright 2019-2020 Zhu, Qun-Ying
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,24 +23,22 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=OSCAR
-VERSION=${VERSION:-1.0.1}
+VERSION=${VERSION:-1.1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
 CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}	# For consistency's sake, use this
+TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}	# Drop the package in /tmp
+OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
@@ -56,9 +54,9 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e # Exit on most errors
+set -e
 
-PRGSRC_NAME=$PRGNAM-code-v$VERSION-Release-1
+PRGSRC_NAME=$PRGNAM-code-v$VERSION
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -68,20 +66,24 @@ cd $PRGSRC_NAME
 chown -R root:root .
 mkdir build
 (cd build; CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" \
- qmake-qt5 ../OSCAR_QT.pro; make)
+    qmake-qt5 ../OSCAR_QT.pro; make $JOBS)
 
 mkdir -p $PKG/usr/bin
 strip --strip-unneeded build/oscar/OSCAR
 cp build/oscar/OSCAR $PKG/usr/bin
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a Htmldocs CONTRIBUTING.md README COPYING $PKG/usr/doc/$PRGNAM-$VERSION
+cp CONTRIBUTING.md README COPYING $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-mkdir -p $PKG/usr/share/icons
+mkdir -p $PKG/usr/share/icons/hicolor/48x48/apps
 mkdir -p $PKG/usr/share/applications
-cp Installers/Linux/OSCAR.png $PKG/usr/share/icons
-cp Installers/Linux/OSCAR.desktop $PKG/usr/share/applications
+mkdir -p $PKG/usr/share/$PRGNAM
+
+cp Building/Linux/OSCAR.png $PKG/usr/share/icons/hicolor/48x48/apps
+cp Building/Linux/OSCAR.desktop $PKG/usr/share/applications
+cp -a build/oscar/Translations $PKG/usr/share/$PRGNAM
+cp -a build/oscar/Html $PKG/usr/share/$PRGNAM
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc