From bf419526fe774a5f8239bcda354f8be42462e84f Mon Sep 17 00:00:00 2001
From: Przemyslaw Czerpak <druzus@priv.onet.pl>
Date: Mon, 9 Nov 2009 16:33:44 +0000
Subject: [PATCH] 2009-11-09 17:33 UTC+0100 Przemyslaw Czerpak
 (druzus/at/priv.onet.pl)   * harbour/bin/hb-func.sh     ! added links with
 full version number to harbour shared library       It fixes problem with
 Harbour tools linked with libharbour-*.so       in system wide installation
 (i.e. in RPM or DEB packages)

---
 harbour/ChangeLog      | 6 ++++++
 harbour/bin/hb-func.sh | 6 ++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 92cc731fa3..99791a3b66 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,12 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-11-09 17:33 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/bin/hb-func.sh
+    ! added links with full version number to harbour shared library
+      It fixes problem with Harbour tools linked with libharbour-*.so
+      in system wide installation (i.e. in RPM or DEB packages)
+
 2009-11-09 16:26 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/config/win/bcc.mk
     * increased library page size for 64 to 96
diff --git a/harbour/bin/hb-func.sh b/harbour/bin/hb-func.sh
index 7315bfcdb7..151a4a7b9a 100755
--- a/harbour/bin/hb-func.sh
+++ b/harbour/bin/hb-func.sh
@@ -911,12 +911,14 @@ mk_hblibso()
                 fi
             else
                 case $HB_LIB_INSTALL in
-                    */usr/lib/*|*/usr/lib64/*|*/usr/local/lib/*|*/usr/local/lib64/*)
+                    /usr/lib/${name}|/usr/lib64/${name}|/usr/local/lib/${name}|/usr/local/lib64/${name})
                         ln -sf ${name}/$l ../$ll
+                        ln -sf ${name}/$l ../$l
                         ;;
-                    */usr/local/*)
+                    /usr/local/${name})
                         mkdir -p ../../lib
                         ln -sf ../${name}/lib/$l ../../lib/$ll
+                        ln -sf ../${name}/lib/$l ../../lib/$l
                         ;;
                     *)
                         ;;