1 files changed, 9 insertions, 20 deletions
diff --git a/system/synaptics/synaptics.SlackBuild b/system/synaptics/synaptics.SlackBuild
index 621bc7a069..dd5a436aa3 100644
--- a/system/synaptics/synaptics.SlackBuild
+++ b/system/synaptics/synaptics.SlackBuild
@@ -2,18 +2,12 @@
 
 ## Written by hollywoodb (hollywoodb@fastmail.fm)
 
-# Verify script is being run by root user.
-if [ "$(id -u)" != "0" ]; then
-    echo "This script must be run as root!"
-    exit
-fi
-
 NAME=synaptics
 VERSION=0.14.6
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
-CWD=`pwd`
+CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$NAME
 OUTPUT=${OUTPUT:-/tmp}
@@ -32,6 +26,9 @@ cd $NAME-$VERSION || exit 1
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
+# Make the Makefile recognize $SLKCFLAGS
+sed -i "s/^CDEBUGFLAGS =.*/CDEBUGFLAGS = $SLKCFLAGS/" Makefile || exit 1
+
 make || exit 1
 
 # Install and strip binaries
@@ -39,15 +36,8 @@ install -D -m 0755 synclient $PKG/usr/bin/synclient
 install -D -m 0755 syndaemon $PKG/usr/bin/syndaemon
 strip --strip-unneeded $PKG/usr/bin/*
 
-# Figure out where to install the driver (needs work, but it's fine for now)
-if [ -d /usr/X11R6/lib/modules ]; then
-    DRIVER_DIR=/usr/X11R6/lib/modules
-else
-    echo "Couldn't determine directory to install Synaptics driver."
-    echo "Please contact SlackBuild author."
-    exit 1
-fi
-install -D -m 444 synaptics_drv.o $PKG/$DRIVER_DIR/input/synaptics_drv.o
+# Install the shared object file
+install -D -m 0755 synaptics_drv.so $PKG/usr/X11/lib/modules/input/synaptics_drv.so
 
 # Install and compress man pages
 mkdir -p $PKG/usr/man/man{1,5}
@@ -56,9 +46,8 @@ cat manpages/syndaemon.1 | gzip -9c > $PKG/usr/man/man1/syndaemon.1.gz
 cat manpages/synaptics.5 | gzip -9c > $PKG/usr/man/man5/synaptics.5.gz
 
 mkdir -p $PKG/usr/doc/$NAME-$VERSION
-cp -a \
-  COMPATIBILITY FILES INSTALL* LICENSE NEWS README* TODO trouble-shooting.txt \
-    $PKG/usr/doc/$NAME-$VERSION
+cp -a COMPATIBILITY FILES INSTALL* LICENSE NEWS README* TODO \
+  trouble-shooting.txt $PKG/usr/doc/$NAME-$VERSION
 cat $CWD/$NAME.SlackBuild > $PKG/usr/doc/$NAME-$VERSION/$NAME.SlackBuild
 
 mkdir -p $PKG/install