1 files changed, 20 insertions, 15 deletions
diff --git a/desktop/icewm/icewm.SlackBuild b/desktop/icewm/icewm.SlackBuild
index 05bd72d253674..f82894255acdd 100644
--- a/desktop/icewm/icewm.SlackBuild
+++ b/desktop/icewm/icewm.SlackBuild
@@ -23,23 +23,21 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=icewm
-VERSION=${VERSION:-1.2.37}
+VERSION=${VERSION:-1.3.6}
 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=i486 ;;
     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}
-PKG=$TMP/package-icewm
+PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
@@ -71,6 +69,9 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# Since we put the html files in $docdir/html/, let's fix the integrated help:
+patch -p1 < $CWD/icewm-1.3.6-fix_html_docdir.diff
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -79,10 +80,10 @@ CXXFLAGS="$SLKCFLAGS" \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --mandir=/usr/man \
   --sysconfdir=/etc \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --with-docdir=/usr/doc/$PRGNAM-$VERSION \
+  --with-cfgdir=/etc/$PRGNAM \
+  --docdir=/usr/doc \
+  --with-docdir=/usr/doc \
   --enable-corefonts \
-  --enable-antialiasing \
   --build=$ARCH-slackware-linux
 
 make
@@ -91,22 +92,26 @@ make install DESTDIR=$PKG
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html
-cp -a AUTHORS BUGS CHANGES COPYING INSTALL PLATFORMS README \
-  README.wm-session TODO VERSION $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a doc/*.html $PKG/usr/doc/$PRGNAM-$VERSION/html
-cat $CWD/icewm.SlackBuild > $PKG/usr/doc/icewm-$VERSION/icewm.SlackBuild
-
 # Add man page
 mkdir -p $PKG/usr/man/man1
 gzip -9c doc/icewm.1.man > $PKG/usr/man/man1/icewm.1.gz
 
 # Add xinitrc for xwmconfig(1)
 mkdir -p $PKG/etc/X11/xinit
-sed "s%@LIBDIR@%/usr/lib${LIBDIRSUFFIX}%g" $CWD/xinitrc.icewm \
-  > $PKG/etc/X11/xinit/xinitrc.icewm
+cat $CWD/xinitrc.icewm > $PKG/etc/X11/xinit/xinitrc.icewm
 chmod 0755 $PKG/etc/X11/xinit/xinitrc.icewm
 
+# Add icewm as a session choice for !kdm desktop managers
+mkdir -p $PKG/usr/share/xsessions
+cat $CWD/icewm.desktop > $PKG/usr/share/xsessions/icewm.desktop
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html
+cp -a \
+  AUTHORS BUGS CHANGES COPYING INSTALL PLATFORMS README* TODO VERSION \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a doc/*.html $PKG/usr/doc/$PRGNAM-$VERSION/html
+cat $CWD/icewm.SlackBuild > $PKG/usr/doc/icewm-$VERSION/icewm.SlackBuild
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh