This one is final

1 files changed, 20 insertions, 7 deletions

diff --git a/unixbench/build/unixbench.SlackBuild b/unixbench/build/unixbench.SlackBuild
index 134cfade..dc796995 100755
--- a/unixbench/build/unixbench.SlackBuild
+++ b/unixbench/build/unixbench.SlackBuild
@@ -145,16 +145,29 @@ chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
 echo Building ...
-export LDFLAGS="$SLKLDFLAGS"
-export CXXFLAGS="$SLKCFLAGS"
 export CFLAGS="$SLKCFLAGS"
-make 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
+make OPTION="$CFLAGS" 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
 
 # Install all the needed stuff to the package dir
-install -Dp -m0755 Run $PKG/usr/bin/unixbench
-
-mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/unixbench/
-cp -av pgms/ testdir/ $PKG/usr/lib${LIBDIRSUFFIX}/unixbench/
+mkdir -p $PKG/usr/bin
+cat <<EOT > $PKG/usr/bin/unixbench
+#!/bin/sh
+# Store results and temporary files in the homedirectory
+# instead of the unixbench directory (which is readonly for most people)
+export UB_TMPDIR=\$HOME/unixbench/tmp
+export UB_TESTDIR=\$HOME/unixbench/testdir
+export UB_RESULTDIR=\$HOME/unixbench/results
+mkdir -p \$UB_TMPDIR \$UB_TESTDIR \$UB_RESULTDIR
+cd /usr/lib${LIBDIRSUFFIX}/unixbench
+echo
+read -p "Writing results to \$UB_RESULTDIR ..." -t 3
+echo
+./Run
+EOT
+chmod 755 $PKG/usr/bin/unixbench
+
+mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/unixbench/{results,tmp}
+cp -av Makefile Run src/ pgms/ testdir/ $PKG/usr/lib${LIBDIRSUFFIX}/unixbench/
 
 # Add documentation:
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION