From 18ac970301258e8f791e534f2be21da5e0539e48 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Thu, 2 Apr 2009 13:11:23 +0000
Subject: [PATCH] 2009-04-02 15:10 UTC+0200 Viktor Szakats (harbour.01 syenar
 hu)   * bin/postinst.bat   + utils/hbi18n/hbi18n.hbm     + Generating
 hbmk2-dll and hbi18n-dll shared-mode executables.

  * utils/hbmk2/hbmk2.prg
    ! Fixed shared libnames for MinGW family.
    ; TOFIX: Still doesn't build shared-mode executables.
---
 harbour/ChangeLog               |  9 +++++++++
 harbour/bin/postinst.bat        |  2 ++
 harbour/make_gnu.bat            |  2 +-
 harbour/utils/hbi18n/hbi18n.hbm |  5 +++++
 harbour/utils/hbmk2/hbmk2.prg   | 16 ++++++++++++++--
 5 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 harbour/utils/hbi18n/hbi18n.hbm

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 439341558f..da7cd29bd0 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,15 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-04-02 15:10 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+  * bin/postinst.bat
+  + utils/hbi18n/hbi18n.hbm
+    + Generating hbmk2-dll and hbi18n-dll shared-mode executables.
+
+  * utils/hbmk2/hbmk2.prg
+    ! Fixed shared libnames for MinGW family.
+    ; TOFIX: Still doesn't build shared-mode executables.
+
 2009-04-02 13:42 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
   * bin/hb-mkdyn.bat
   * bin/postinst.bat
diff --git a/harbour/bin/postinst.bat b/harbour/bin/postinst.bat
index 6bddcbe567..f77c80c8a5 100644
--- a/harbour/bin/postinst.bat
+++ b/harbour/bin/postinst.bat
@@ -43,6 +43,8 @@ if not "%HB_DYNLIB%" == "yes" goto _SKIP_DLL_BIN
    if exist "%_HB_BIN_INSTALL%\*.dll" (
       %HB_BIN_INSTALL%\hbmk2 -q0 -shared -o%_HB_BIN_INSTALL%\hbrun-dll  %~dp0..\utils\hbrun\hbrun.hbm -lhbcplr -lhbpp -lhbcommon
       %HB_BIN_INSTALL%\hbmk2 -q0 -shared -o%_HB_BIN_INSTALL%\hbtest-dll %~dp0..\utils\hbtest\hbtest.hbm
+      %HB_BIN_INSTALL%\hbmk2 -q0 -shared -o%_HB_BIN_INSTALL%\hbmk2-dll  %~dp0..\utils\hbmk2\hbmk2.hbm
+      %HB_BIN_INSTALL%\hbmk2 -q0 -shared -o%_HB_BIN_INSTALL%\hbi18n-dll %~dp0..\utils\hbi18n\hbi18n.hbm
    )
    endlocal
 
diff --git a/harbour/make_gnu.bat b/harbour/make_gnu.bat
index b2116bf3da..df5ccf90dc 100644
--- a/harbour/make_gnu.bat
+++ b/harbour/make_gnu.bat
@@ -139,7 +139,7 @@ if not exist %HB_DOC_INSTALL%\*.* md %HB_DOC_INSTALL%
 :DO_GCC
 
    set HB_DYNLIB=no
-   %_HB_MAKE% clean install %HB_USER_MAKEFLAGS% %1 %2 %3 %4 %5 %6 %7 %8 %9
+   %_HB_MAKE% install %HB_USER_MAKEFLAGS% %1 %2 %3 %4 %5 %6 %7 %8 %9
    goto MAKE_DONE
 
 :SKIP_WINDLL
diff --git a/harbour/utils/hbi18n/hbi18n.hbm b/harbour/utils/hbi18n/hbi18n.hbm
new file mode 100644
index 0000000000..edf09e5135
--- /dev/null
+++ b/harbour/utils/hbi18n/hbi18n.hbm
@@ -0,0 +1,5 @@
+#
+# $Id$
+#
+
+hbi18n.prg
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 9864b988c3..ab3de21bf6 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -1417,8 +1417,20 @@ FUNCTION Main( ... )
                s_aLIBSYS := ArrayAJoin( { s_aLIBSYS, s_aLIBSYSCORE, s_aLIBSYSMISC } )
             ENDIF
          ENDIF
-         s_aLIBSHARED := { iif( s_lMT, "harbourmt-" + cDL_Version_Alter,;
-                                       "harbour-" + cDL_Version_Alter ) }
+         DO CASE
+         CASE t_cCOMP == "mingw64"
+            s_aLIBSHARED := { iif( s_lMT, "harbourmt-" + cDL_Version_Alter + "-x64",;
+                                          "harbour-" + cDL_Version_Alter + "-x64" ) }
+         CASE t_cCOMP == "mingwce"
+            s_aLIBSHARED := { iif( s_lMT, "harbourmt-" + cDL_Version_Alter + "-arm",;
+                                          "harbour-" + cDL_Version_Alter + "-arm" ) }
+         CASE t_cCOMP == "mingwarm"
+            s_aLIBSHARED := { iif( s_lMT, "harbourmt-" + cDL_Version_Alter + "-arm",;
+                                          "harbour-" + cDL_Version_Alter + "-arm" ) }
+         OTHERWISE
+            s_aLIBSHARED := { iif( s_lMT, "harbourmt-" + cDL_Version_Alter,;
+                                          "harbour-" + cDL_Version_Alter ) }
+         ENDCASE
 
          IF s_lFMSTAT != NIL .AND. s_lFMSTAT
             AAdd( s_aLIBFM, iif( s_lMT, "hbfmmt", "hbfm" ) )