1 files changed, 21 insertions, 7 deletions
diff --git a/source/ap/texinfo/texinfo.SlackBuild b/source/ap/texinfo/texinfo.SlackBuild
index d7cc724c8..ed6325480 100755
--- a/source/ap/texinfo/texinfo.SlackBuild
+++ b/source/ap/texinfo/texinfo.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2008, 2009, 2010, 2016, 2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2016, 2018, 2019  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=texinfo
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -94,7 +94,6 @@ CFLAGS="$SLKCFLAGS" \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --mandir=/usr/man \
   --infodir=/usr/info \
-  --disable-static \
   --docdir=/usr/doc/texinfo-$VERSION \
   --disable-perl-xs \
   --build=$ARCH-slackware-linux || exit 1
@@ -102,13 +101,28 @@ CFLAGS="$SLKCFLAGS" \
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
-# Be sure this is "fresh"
-zcat $CWD/dir.gz > $PKG/usr/info/dir
-mv $PKG/usr/info/dir $PKG/usr/info/dir.new
-
 gzip -9 $PKG/usr/info/*info*
 gzip -9 $PKG/usr/man/man?/*
 
+# Add update-info-dir script and manpage originally from Debian:
+mkdir -p $PKG/usr/sbin
+cp -a $CWD/update-info-dir.gz $PKG/usr/sbin
+gzip -d $PKG/usr/sbin/update-info-dir.gz
+chown root:root $PKG/usr/sbin/update-info-dir
+chmod 755 $PKG/usr/sbin/update-info-dir
+mkdir -p $PKG/usr/man/man8
+cp -a $CWD/update-info-dir.8.gz $PKG/usr/man/man8
+chown root:root $PKG/usr/man/man8/update-info-dir.8.gz
+chmod 644 $PKG/usr/man/man8/update-info-dir.8.gz
+
+# Eliminate stale /usr/info/dir:
+rm -f $PKG/usr/info/dir
+
+# Run update-info-dir to get a current /usr/info/dir, then install it into the
+# package as .new:
+sh $PKG/usr/sbin/update-info-dir
+cp -a /usr/info/dir $PKG/usr/info/dir.new
+
 mkdir -p $PKG/usr/doc/texinfo-$VERSION
 cp -a \
   ABOUT-NLS AUTHORS COPYING* INSTALL INTRODUCTION NEWS README* TODO \