diff options
Diffstat (limited to 'system/xchm/xchm.SlackBuild')
-rw-r--r-- | system/xchm/xchm.SlackBuild | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/system/xchm/xchm.SlackBuild b/system/xchm/xchm.SlackBuild index 4a581b958d..3ac57e98a1 100644 --- a/system/xchm/xchm.SlackBuild +++ b/system/xchm/xchm.SlackBuild @@ -1,28 +1,38 @@ -#!/bin/sh +#!/bin/bash # # Slackware build script for xchm # Written by Michael Gehring <mg@ebfe.org> +# 20220209 bkw: Modified by SlackBuilds.org, fix the build when wxGTK3 +# was installed after wxPython. + +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=xchm VERSION=${VERSION:-1.23} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac fi -CWD=$(pwd) +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686 -fno-strict-aliasing" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686 -fno-strict-aliasing" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686 -fno-strict-aliasing" @@ -53,6 +63,7 @@ find -L . \ CFLAGS=$SLKCFLAGS \ CXXFLAGS=$SLKCFLAGS \ ./configure \ + --with-wx-config=/usr/lib$LIBDIRSUFFIX/wx/config/gtk2-unicode-release-2.8 \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --build=$ARCH-slackware-linux \ @@ -72,4 +83,4 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE |