3 files changed, 36 insertions, 35 deletions
diff --git a/libraries/exo-notify/README b/libraries/exo-notify/README
index a7b8c742c7af..c097d4cc552a 100644
--- a/libraries/exo-notify/README
+++ b/libraries/exo-notify/README
@@ -1,7 +1,8 @@
-exo-notify contains the exo-mount-notify binary that is created when 
-compiling exo against libnotify. All other exo files are included in 
-the official Slackware Xfce package.  Note that the version of exo
-used to build exo-notify must match the version of exo included with
-the Slackware's xfce package.
+exo-notify contains the exo-mount-notify binary that is created when
+compiling exo against libnotify. All other exo files are included in
+the official Slackware Xfce package.
 
-libnotify is required to build exo-notify.
+libnotify (available at SBo) is required to build exo-notify.
+
+NOTE: The version of exo used to build exo-notify must match the
+version of exo included with Slackware's Xfce package.
diff --git a/libraries/exo-notify/exo-notify.SlackBuild b/libraries/exo-notify/exo-notify.SlackBuild
index 4a1e0923c143..da31db0b00d3 100644
--- a/libraries/exo-notify/exo-notify.SlackBuild
+++ b/libraries/exo-notify/exo-notify.SlackBuild
@@ -22,11 +22,10 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-PRGNAM=exo
-PKGNAME=exo-notify
-VERSION=0.3.4
+PRGNAM=exo-notify
+VERSION=${VERSION:-0.3.4}
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -36,20 +35,23 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e
 
 rm -rf $PKG
-mkdir -p $TMP $PKG/usr/libexec $OUTPUT
+mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar -xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION
+rm -rf exo-$VERSION
+tar xvf $CWD/exo-$VERSION.tar.bz2
+cd exo-$VERSION
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -61,30 +63,28 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
-  --program-prefix="" \
-  --program-suffix="" \
-  --enable-shared=yes \
   --enable-static=no \
   --enable-notifications \
   --enable-hal \
   --enable-debug=no \
-  --build=$ARCH-slackware-linux \
   --build=$ARCH-slackware-linux
 
 make
 
-install -m 0755 $TMP/$PRGNAM-$VERSION/exo-mount-notify/exo-mount-notify-0.3 \
-  $PKG/usr/libexec
+mkdir -p $PKG/usr/libexec
+install -m 0755 $TMP/exo-$VERSION/exo-mount-notify/exo-mount-notify-0.3 \
+  $PKG/usr/libexec 
 strip --strip-unneeded $PKG/usr/libexec/exo-mount-notify-0.3
 
-mkdir -p $PKG/usr/doc/$PKGNAME-$VERSION
-cat $CWD/$PKGNAME.SlackBuild > $PKG/usr/doc/$PKGNAME-$VERSION/$PKGNAME.SlackBuild
-cat $CWD/README > $PKG/usr/doc/$PKGNAME-$VERSION/README.Slackware
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README.Slackware
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PKGNAME-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
diff --git a/libraries/exo-notify/slack-desc b/libraries/exo-notify/slack-desc
index 87a0193982ba..0ae717ebc94e 100644
--- a/libraries/exo-notify/slack-desc
+++ b/libraries/exo-notify/slack-desc
@@ -1,19 +1,19 @@
 # HOW TO EDIT THIS FILE:
 # The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
+# up the first '|' above the ':' following the base package name, and the '|' on
+# the right side marks the last column you can put a character in.  You must make
+# exactly 11 lines for the formatting to be correct.  It's also customary to
+# leave one space after the ':'.
 
-          |-----handy-ruler---------------------------------------------------|
+          |-----handy-ruler------------------------------------------------------|
 exo-notify: exo-notify (exo-mount-notify binary)
 exo-notify:
-exo-notify: exo-notify contains the exo-mount-notify binary that is
-exo-notify: created when compiling exo against libnotify. All other
-exo-notify: exo files are included in the official Slackware Xfce
-exo-notify: package.
-exo-notify:
-exo-notify: libnotify is required to build exo-notify.
+exo-notify: exo-notify contains the exo-mount-notify binary that is created when
+exo-notify: compiling exo against libnotify. All other exo files are included in
+exo-notify: the official Slackware Xfce package.
 exo-notify:
 exo-notify: Homepage: http://www.xfce.org/
 exo-notify:
+exo-notify:
+exo-notify:
+exo-notify: