1 files changed, 12 insertions, 20 deletions
diff --git a/development/gnome-inform7/gnome-inform7.SlackBuild b/development/gnome-inform7/gnome-inform7.SlackBuild
index 48bb0cc8ae..ce12ab2544 100644
--- a/development/gnome-inform7/gnome-inform7.SlackBuild
+++ b/development/gnome-inform7/gnome-inform7.SlackBuild
@@ -5,7 +5,7 @@
 # Written by Dugan Chen (thedoogster@gmail.com)
 
 PRGNAM=gnome-inform7
-VERSION=${VERSION:-6G60}
+VERSION=${VERSION:-6L02}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -55,9 +55,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-mkdir -p $PKG/usr/doc
 sh install-inform7.sh -p $PKG/usr
-mv $PKG/usr/share/doc/inform7 $PKG/usr/doc/inform7-$VERSION
+mv $PKG/usr/share/doc $PKG/usr
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
@@ -65,7 +64,7 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 # Then install the GUI.
 
 rm -rf $PRGNAM-$VERSION
-tar xfv $CWD/I7_${VERSION}_GNOME_Source.tar.gz
+tar xfv $CWD/$PRGNAM-${VERSION}.tar.xz
 cp $PKG/usr/share/inform7/Compilers/ni $PRGNAM-$VERSION/src/ni/
 cd $PRGNAM-$VERSION
 chown -R root:root .
@@ -75,6 +74,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+sh autogen.sh
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -84,28 +84,20 @@ CXXFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --mandir=/usr/man \
   --datarootdir=/usr/share \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --docdir=/usr/doc/$PRGNAM-$VERSION/gnome-inform7 \
   --build=$ARCH-slackware-linux
-
-make \
-  docdir=/usr/doc/$PRGNAM-$VERSION \
-  inform6docdir=/usr/doc/$PRGNAM-$VERSION/inform6 \
-  frotzdocdir=/usr/doc/$PRGNAM-$VERSION/frotz \
-  glulxedocdir=/usr/doc/$PRGNAM-$VERSION/glulxe \
-  gitdocdir=/usr/doc/$PRGNAM-$VERSION/git
-
-make install \
-  docdir=/usr/doc/$PRGNAM-$VERSION \
-  inform6docdir=/usr/doc/$PRGNAM-$VERSION/inform6 \
-  frotzdocdir=/usr/doc/$PRGNAM-$VERSION/frotz \
-  glulxedocdir=/usr/doc/$PRGNAM-$VERSION/glulxe \
-  gitdocdir=/usr/doc/$PRGNAM-$VERSION/git \
-  DESTDIR=$PKG
+make
+make install DESTDIR=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
+# Move the docs from usr/share/doc to usr/doc
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mv $PKG/usr/share/doc/* $PKG/usr/doc/$PRGNAM-$VERSION
+mv $PKG/usr/doc/inform7 $PKG/usr/doc/$PRGNAM-$VERSION
 rmdir $PKG/usr/share/doc
+
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install