From c417d61afa15f34bbecdfdf0fda8971b39f877c6 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Mon, 18 May 2009 09:20:34 +0000
Subject: [PATCH] 2009-05-18 11:19 UTC+0200 Viktor Szakats (harbour.01 syenar
 hu)   * bin/hb-func.sh     ! HB_USER_LIBS_DEF -> CC_HB_USER_LIBS     ;
 QUESTION: Is it a problem to move these to HB_ namespace?

  * source/rtl/lang.c
    ! Fixed to return language IDs with consistent '-' separators
      instead of '_'. We may change this to consistent '_', if
      we decide it's better.
---
 harbour/ChangeLog         | 10 ++++++++++
 harbour/bin/hb-func.sh    |  4 ++--
 harbour/source/rtl/lang.c |  2 ++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 1b47bc57cb..a7a888a32c 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,16 @@
    past entries belonging to these authors: Viktor Szakats.
 */
 
+2009-05-18 11:19 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+  * bin/hb-func.sh
+    ! HB_USER_LIBS_DEF -> CC_HB_USER_LIBS
+    ; QUESTION: Is it a problem to move these to HB_ namespace?
+
+  * source/rtl/lang.c
+    ! Fixed to return language IDs with consistent '-' separators
+      instead of '_'. We may change this to consistent '_', if
+      we decide it's better.
+
 2009-05-18 11:03 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/source/rtl/filesys.c
     ! fixed OpenWatcom Linux builds which does not support utimes() yet.
diff --git a/harbour/bin/hb-func.sh b/harbour/bin/hb-func.sh
index 711d025b05..00f2878ffb 100755
--- a/harbour/bin/hb-func.sh
+++ b/harbour/bin/hb-func.sh
@@ -252,8 +252,8 @@ mk_hbtools()
     if [ -n "${CC_HB_USER_LDFLAGS}" ]; then
         echo "ldflags=${CC_HB_USER_LDFLAGS}">> ${hb_hbmkcfg}
     fi
-    if [ -n "${HB_USER_LIBS_DEF}" ]; then
-        echo "libs=${HB_USER_LIBS_DEF}">> ${hb_hbmkcfg}
+    if [ -n "${CC_HB_USER_LIBS}" ]; then
+        echo "libs=${CC_HB_USER_LIBS}">> ${hb_hbmkcfg}
     fi
     if [ "${HB_GPM_MOUSE}" = "yes" ]; then
         echo "libs=gpm">> ${hb_hbmkcfg}
diff --git a/harbour/source/rtl/lang.c b/harbour/source/rtl/lang.c
index 7ed907c46e..6de54b39a2 100644
--- a/harbour/source/rtl/lang.c
+++ b/harbour/source/rtl/lang.c
@@ -287,6 +287,8 @@ HB_FUNC( HB_USERLANG )
       {
          if( ietf[ tmp ] == '.' )
             break;
+         else if( ietf[ tmp ] == '_' )
+            ietf[ tmp ] = '-';
       }
 
       hb_retclen_buffer( ietf, tmp );