diff options
| author | B. Watson <yalhcru@gmail.com> | 2022-04-19 11:26:36 -0400 |
|---|---|---|
| committer | B. Watson <yalhcru@gmail.com> | 2022-04-19 11:26:36 -0400 |
| commit | 6e640cfafa0efdcbafddfc915654959f2f69de59 (patch) | |
| tree | 34cc1dc681a564e1c1885c9cc6a72f26d5feb7d6 | |
| parent | 9511df1beaab8e8aab40aded43c203bbf7cff291 (diff) | |
| download | slackbuilds-6e640cfafa0efdcbafddfc915654959f2f69de59.tar.gz | |
libraries/gtkhtml: Fix doc, doinst.sh.
Signed-off-by: B. Watson <yalhcru@gmail.com>
| -rw-r--r-- | libraries/gtkhtml/doinst.sh | 3 | ||||
| -rw-r--r-- | libraries/gtkhtml/gtkhtml.SlackBuild | 26 |
2 files changed, 12 insertions, 17 deletions
diff --git a/libraries/gtkhtml/doinst.sh b/libraries/gtkhtml/doinst.sh deleted file mode 100644 index 682c942551..0000000000 --- a/libraries/gtkhtml/doinst.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -#we installed a library so run ldconfig -/sbin/ldconfig diff --git a/libraries/gtkhtml/gtkhtml.SlackBuild b/libraries/gtkhtml/gtkhtml.SlackBuild index dd4da69fc2..1df1b12620 100644 --- a/libraries/gtkhtml/gtkhtml.SlackBuild +++ b/libraries/gtkhtml/gtkhtml.SlackBuild @@ -22,11 +22,16 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20220519 bkw: Modified by SlackBuilds.org, BUILD=3: +# - install doc in /usr/doc, not /usr/share/doc. +# - rm doinst.sh: all it did was lfdconfig, and installpkg calls that already. +# - get rid of useless INSTALL in doc dir. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=gtkhtml VERSION=${VERSION:-4.10.0} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -38,9 +43,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -75,9 +77,9 @@ cd $PRGNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ + -o -perm 511 \) -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ patch -p0 < $CWD/enchant-2.patch @@ -95,20 +97,16 @@ CXXFLAGS="$SLKCFLAGS" \ --build=$ARCH-slackware-linux 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 +make install-strip DESTDIR=$PKG -mkdir -p $PKG/usr/share/doc/$PRGNAM-$VERSION -cp AUTHORS INSTALL TODO BUGS NEWS COPYING ChangeLog README $PKG/usr/share/doc/$PRGNAM-$VERSION/ -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/share/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp AUTHORS TODO BUGS NEWS COPYING ChangeLog README $PKG/usr/doc/$PRGNAM-$VERSION/ +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild rm -f $PKG/usr/lib*/*.la 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.$PKGTYPE |