aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhu Qun-Ying <zhu.qunying@gmail.com>2020-01-10 17:28:42 -0800
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2020-01-12 00:26:02 +0700
commit583427a212d2fcb6b69017884c368fcba2920853 (patch)
tree5496ede3ca6334f5703527402f5cbd5550be3306
parentc02b9d88746f1f546030ed401b6313e19310ea3b (diff)
libraries/librhtv: Add back rhtv-config.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--libraries/librhtv/README4
-rw-r--r--libraries/librhtv/librhtv.SlackBuild15
2 files changed, 9 insertions, 10 deletions
diff --git a/libraries/librhtv/README b/libraries/librhtv/README
index 7873230457282..33aa8bac832a0 100644
--- a/libraries/librhtv/README
+++ b/libraries/librhtv/README
@@ -12,7 +12,3 @@ like interface (check boxes, radio buttons, push buttons, input lines,
pull-down menues, status bars, etc.). All the people accustomed to the
Windows, MacOS, OS/2, Motif, GTK, etc. interfaces will understand the
interface at first sight.
-
-Note: rhtv-config is not included in the final package, as some of its
-output (--dir-libs, --include) contain source directory. A custom librhtv.pc
-file is used.
diff --git a/libraries/librhtv/librhtv.SlackBuild b/libraries/librhtv/librhtv.SlackBuild
index af7a046305e0f..1dfdbc3b9d270 100644
--- a/libraries/librhtv/librhtv.SlackBuild
+++ b/libraries/librhtv/librhtv.SlackBuild
@@ -24,7 +24,7 @@
PRGNAM=librhtv
VERSION=${VERSION:-2.2.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -75,19 +75,22 @@ find -L . \
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
+
+# remove mentioning of local building directory information in
+# include/tv/configtv.h
+sed -i -e "s/\/tmp\/SBo\/librhtv-$VERSION\/tvision\/include//g" \
+ -e "s/\/tmp\/SBo\/librhtv-$VERSION\/tvision\/makes//g" \
+ -e "s/\/tmp\/SBo\/librhtv-$VERSION\/tvision//g" include/tv/configtv.h
# need to modified the libdir in the Makefile
if [ "$ARCH" = "x86_64" ]; then
sed -i -s 's/prefix)\/lib/prefix)\/lib64/g' Makefile
fi
-
make
make install prefix=$PKG/usr
-rm -rf $PKG/usr/bin
-strip --strip-unneeded $PKG/usr/lib$LIBDIRSUFFIX/librhtv.so.$VERSION
+strip --strip-unneeded $PKG/usr/lib$LIBDIRSUFFIX/librhtv.so.$VERSION \
+$PKG/usr/bin/*
mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/pkgconfig
if [ "$ARCH" != "x86_64" ]; then