From 583427a212d2fcb6b69017884c368fcba2920853 Mon Sep 17 00:00:00 2001
From: Zhu Qun-Ying
Date: Fri, 10 Jan 2020 17:28:42 -0800
Subject: libraries/librhtv: Add back rhtv-config.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 libraries/librhtv/README             |  4 ----
 libraries/librhtv/librhtv.SlackBuild | 15 +++++++++------
 2 files changed, 9 insertions(+), 10 deletions(-)

(limited to 'libraries')

diff --git a/libraries/librhtv/README b/libraries/librhtv/README
index 7873230457..33aa8bac83 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 af7a046305..1dfdbc3b9d 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
-- 
cgit v1.2.3