diff --git a/desktop/wmii/wmii.SlackBuild b/desktop/wmii/wmii.SlackBuild index 62673bff17..d7e25f3518 100644 --- a/desktop/wmii/wmii.SlackBuild +++ b/desktop/wmii/wmii.SlackBuild @@ -27,7 +27,7 @@ PRGNAM=wmii SRCNAM=wmii+ixp VERSION=${VERSION:-3.9.2} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -77,12 +77,18 @@ patch -p1 < $CWD/wmii-3.9.2-config_mk.diff # Fixup mk/hdr.mk patch -p1 < $CWD/wmii-3.9.2-mk_hdr_mk.diff +# Fix the man pages +sed -zi 's,\.P[^@]@DOCDIR@/wmii\.pdf,,' man/wmii.1 +sed -i "s,@DOCDIR@,/usr/doc/$PRGNAM-$VERSION,g" man/wmii.1 +sed -i "s,@CONFPREFIX@,/etc,g" man/wmii.1 + LDFLAGS="-lX11 -lXrender" \ make \ OPT="$SLKCFLAGS" \ PREFIX=/usr \ MAN=/usr/man \ ETC=/etc \ + DOC=/usr/doc/$PRGNAM-$VERSION \ LIBDIRSUFFIX=${LIBDIRSUFFIX} make install \ @@ -90,6 +96,7 @@ make install \ PREFIX=$PKG/usr \ MAN=$PKG/usr/man \ ETC=$PKG/etc \ + DOC=$PKG/usr/doc/$PRGNAM-$VERSION \ LIBDIRSUFFIX=${LIBDIRSUFFIX} # Add wmii to xwmconfig's list... @@ -111,11 +118,12 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ find $PKG/usr/man -type f -exec gzip -9 {} \; -mv $PKG/usr/share/doc $PKG/usr -mv $PKG/usr/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION cp -a LICENSE README $PKG/usr/doc/$PRGNAM-$VERSION +# The directories were there, but no files +cp -r alternative_wmiircs $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -( cd $PKG/usr/doc ; ln -s $PRGNAM-$VERSION $PRGNAM ) +# hmm? +#( cd $PKG/usr/doc ; ln -s $PRGNAM-$VERSION $PRGNAM ) mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc