From 5375c51c2da0c8b0f319c34f626e72b445c04c68 Mon Sep 17 00:00:00 2001
From: Przemyslaw Czerpak <druzus@priv.onet.pl>
Date: Wed, 6 Aug 2008 15:31:35 +0000
Subject: [PATCH] 2008-08-06 17:31 UTC+0200 Przemyslaw Czerpak
 (druzus/at/priv.onet.pl)   * harbour/bin/hb-func.sh   *
 harbour/bin/postinst.sh     * changed FM lib name to HBFM

  * harbour/bin/hb-mkslib.sh
    * respect L_USR also in Windows builds
---
 harbour/ChangeLog        |  8 ++++++++
 harbour/bin/hb-func.sh   |  4 ++--
 harbour/bin/hb-mkslib.sh |  2 +-
 harbour/bin/postinst.sh  | 10 +++++-----
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index abd388068e..5f5794411c 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,14 @@
    2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2008-08-06 17:31 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/bin/hb-func.sh
+  * harbour/bin/postinst.sh
+    * changed FM lib name to HBFM
+
+  * harbour/bin/hb-mkslib.sh
+    * respect L_USR also in Windows builds
+
 2008-08-06 16:14 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
    * contrib/hbapollo/Makefile
    * contrib/hbapollo/apollo.c
diff --git a/harbour/bin/hb-func.sh b/harbour/bin/hb-func.sh
index c1265eaed5..30674dd4d6 100755
--- a/harbour/bin/hb-func.sh
+++ b/harbour/bin/hb-func.sh
@@ -488,7 +488,7 @@ l="mainwin"
 [ "\${HB_MT}" = "MT" ] && [ -f "\${HB_LIB_INSTALL}/lib\${l}mt.a" ] && l="\${l}mt"
 [ -f "\${HB_LIB_INSTALL}/lib\${l}.a" ] && HARBOUR_LIBS="\${HARBOUR_LIBS} -l\${l}"
 
-l="fm"
+l="hbfm"
 [ "\${HB_MT}" = "MT" ] && [ -f "\${HB_LIB_INSTALL}/lib\${l}mt.a" ] && l="\${l}mt"
 if [ -f "\${HB_LIB_INSTALL}/lib\${l}.a" ] && \\
    ( [ -n "\${HB_FM_REQ}" ] || [ "\${HB_STATIC}" = "yes" ] ) && \\
@@ -641,7 +641,7 @@ mk_hblibso()
     for l in ${hb_libs}
     do
         case $l in
-            hbdebug|profiler|fm|hbodbc|gtalleg|rddads) ;;
+            hbdebug|profiler|hbfm|hbodbc|gtalleg|rddads) ;;
             *)
                 ls="lib${l}.a"
                 if [ -f lib${l}mt.a ]
diff --git a/harbour/bin/hb-mkslib.sh b/harbour/bin/hb-mkslib.sh
index 8445760bdb..2fd72b61f5 100755
--- a/harbour/bin/hb-mkslib.sh
+++ b/harbour/bin/hb-mkslib.sh
@@ -132,7 +132,7 @@ elif [ "${SLIB_EXT}" = ".dll" ]; then
         SYSLIBS="-luser32 -lwinspool -lgdi32 -lcomctl32 -lcomdlg32 -lole32"
         SYSLIBS="${SYSLIBS} -loleaut32 -luuid -lmpr -lwsock32 -lws2_32 -lmapi32"
     fi
-    ${CCPREFIX}gcc -shared -o "${FULLNAME}" $OBJLST ${linker_options} ${SYSLIBS} ${HB_DLLIBS} && \
+    ${CCPREFIX}gcc -shared -o "${FULLNAME}" $OBJLST ${linker_options} ${L_USR} ${SYSLIBS} ${HB_DLLIBS} && \
         cd "${dir}" && \
         rm -f "${DSTDIR}${FULLNAME}" && \
         mv -f "${OTMPDIR}/${FULLNAME}" "${DSTDIR}${FULLNAME}"
diff --git a/harbour/bin/postinst.sh b/harbour/bin/postinst.sh
index 33d2024249..f11233e457 100755
--- a/harbour/bin/postinst.sh
+++ b/harbour/bin/postinst.sh
@@ -78,18 +78,18 @@ then
        [ "$HB_COMPILER" = "mingw32" ] || [ "$HB_COMPILER" = "cemgw" ]; then
         mk_hblibso "${hb_root}"
     fi
-    # build fm lib with memory statistic
+    # build hbfm lib with memory statistic
     (cd ${hb_root}/source/vm
     C_USR=${C_USR//-DHB_FM_STATISTICS_OFF/}
     rm -f fm.o
     ${MAKE} -r fm.o
-    ${AR} ${HB_LIB_INSTALL}/libfm.a fm.o
-    [ -n "${RANLIB}" ] && ${RANLIB} ${HB_LIB_INSTALL}/libfm.a
+    ${AR} ${HB_LIB_INSTALL}/libhbfm.a fm.o
+    [ -n "${RANLIB}" ] && ${RANLIB} ${HB_LIB_INSTALL}/libhbfm.a
     rm -f fm.o
     if [ "${HB_MT}" = "MT" ]; then
         ${MAKE} -r fm.o 'HB_LIBCOMP_MT=YES'
-        ${AR} ${HB_LIB_INSTALL}/libfmmt.a fm.o
-        [ -n "${RANLIB}" ] && ${RANLIB} ${HB_LIB_INSTALL}/libfmmt.a
+        ${AR} ${HB_LIB_INSTALL}/libhbfmmt.a fm.o
+        [ -n "${RANLIB}" ] && ${RANLIB} ${HB_LIB_INSTALL}/libhbfmmt.a
         rm -f fm.o
     fi
     )