1 files changed, 14 insertions, 7 deletions
diff --git a/desktop/wmweather/wmweather.SlackBuild b/desktop/wmweather/wmweather.SlackBuild
index 013932ab9f180..8bee6530f8d3d 100644
--- a/desktop/wmweather/wmweather.SlackBuild
+++ b/desktop/wmweather/wmweather.SlackBuild
@@ -18,10 +18,13 @@ 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
@@ -30,7 +33,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xvf $CWD/$PRGNAM\_$VERSION.orig.tar.gz
+tar xvf $CWD/${PRGNAM}_$VERSION.orig.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
@@ -44,15 +47,20 @@ cd src
   CXXFLAGS="$SLKCFLAGS" \
   ./configure \
     --prefix=/usr \
-    --sysconfdir=/etc \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --sysconfdir=/etc/X11/WindowMaker \
     --localstatedir=/var \
     --mandir=/usr/man \
-    --disable-debug
+    --disable-debug \
+    --build=$ARCH-slackware-linux
 
   make
   make install DESTDIR=$PKG
 cd -
 
+mv $PKG/etc/X11/WindowMaker/wmweather.conf \
+  $PKG/etc/X11/WindowMaker/wmweather.conf.new
+
 ( cd $PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
     xargs strip --strip-unneeded 2> /dev/null || true
@@ -66,13 +74,12 @@ cd -
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CHANGES COPYING README \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGES COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
-
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}