From eba02d6beee391caf8cb7d476e1ea27e45434f5b Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Sat, 19 Sep 2009 12:48:31 +0000
Subject: [PATCH] 2009-09-19 14:47 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * utils/hbmk2/hbmk2.prg     % Deleted bin dir from lib dir list
 in shared mode for       non-*nix compilers. Implibs are used in all cases so
 this       is isn't necessary anymore.

---
 harbour/ChangeLog             |  6 ++++++
 harbour/utils/hbmk2/hbmk2.prg | 15 ---------------
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 1140bbfdb5..cb7719a5ad 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,12 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-09-19 14:47 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/hbmk2.prg
+    % Deleted bin dir from lib dir list in shared mode for
+      non-*nix compilers. Implibs are used in all cases so this
+      is isn't necessary anymore.
+
 2009-09-19 14:43 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/mpkg_deb.sh
   * harbour/mpkg_rpm.sh
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index e1372d050c..4e91553899 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -2324,9 +2324,6 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
          IF hbmk[ _HBMK_lIMPLIB ]
             AAdd( hbmk[ _HBMK_aOPTD ], "-Wl,--out-implib,{OI}" )
          ENDIF
-         IF hbmk[ _HBMK_lSHARED ]
-            AAdd( hbmk[ _HBMK_aLIBPATH ], l_cHB_BIN_INSTALL )
-         ENDIF
          IF l_lLIBGROUPING .AND. hbmk[ _HBMK_cCOMP ] $ "mingw|mingw64|mingwarm"
             AAdd( hbmk[ _HBMK_aOPTL ], "-Wl,--start-group {LL} {LB} -Wl,--end-group" )
             AAdd( hbmk[ _HBMK_aOPTD ], "-Wl,--start-group {LL} {LB} -Wl,--end-group" )
@@ -2409,9 +2406,6 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
          IF hbmk[ _HBMK_lIMPLIB ]
             AAdd( hbmk[ _HBMK_aOPTD ], "-Wl,--out-implib,{OI}" )
          ENDIF
-         IF hbmk[ _HBMK_lSHARED ]
-            AAdd( hbmk[ _HBMK_aLIBPATH ], l_cHB_BIN_INSTALL )
-         ENDIF
          AAdd( hbmk[ _HBMK_aOPTL ], "{LL} {LB}" )
          l_aLIBHBBASE_2 := iif( hbmk[ _HBMK_lMT ], aLIB_BASE_2_MT, aLIB_BASE_2 )
          IF ! hbmk[ _HBMK_lSHARED ]
@@ -2723,9 +2717,6 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
                ENDIF
             ENDIF
          ENDIF
-         IF hbmk[ _HBMK_lSHARED ]
-            AAdd( hbmk[ _HBMK_aLIBPATH ], l_cHB_BIN_INSTALL )
-         ENDIF
          l_aLIBSHARED := { iif( hbmk[ _HBMK_lMT ], "harbourmt" + cDL_Version_Alter + "-bcc" + cLibExt,;
                                                    "harbour" + cDL_Version_Alter + "-bcc" + cLibExt ) }
          l_aLIBSHAREDPOST := { "hbmainstd", "hbmainwin" }
@@ -2837,9 +2828,6 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
                ENDIF
             ENDIF
          ENDIF
-         IF hbmk[ _HBMK_lSHARED ]
-            AAdd( hbmk[ _HBMK_aLIBPATH ], l_cHB_BIN_INSTALL )
-         ENDIF
          l_aLIBSYS := ArrayAJoin( { l_aLIBSYS, l_aLIBSYSCORE, l_aLIBSYSMISC } )
          DO CASE
          CASE hbmk[ _HBMK_cCOMP ] $ "msvc|icc"
@@ -2934,9 +2922,6 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
          cOpt_Link := "-out:{OE} {LO} {DL} {FL} {LL} {LB} {LS}"
          cLibPathPrefix := "-libpath:"
          cLibPathSep := " "
-         IF hbmk[ _HBMK_lSHARED ]
-            AAdd( hbmk[ _HBMK_aLIBPATH ], l_cHB_BIN_INSTALL )
-         ENDIF
          IF hbmk[ _HBMK_lMAP ]
             AAdd( hbmk[ _HBMK_aOPTL ], "-map" )
          ENDIF