From fade421d2c28fd2898cff009c8c87305f90ccd6b Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 7 Aug 2010 12:49:45 +0000 Subject: [PATCH] 2010-08-07 14:49 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * utils/hbmk2/hbmk2.prg ! Fixed to prepend dynlib prefix to output name -hbdyn mode. --- harbour/ChangeLog | 4 ++++ harbour/utils/hbmk2/hbmk2.prg | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 3337381a12..0f8318848b 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,10 @@ The license applies to all entries newer than 2009-04-28. */ +2010-08-07 14:49 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * utils/hbmk2/hbmk2.prg + ! Fixed to prepend dynlib prefix to output name -hbdyn mode. + 2010-08-07 14:38 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbpost.hbm ! Fixed to place contrib dynamic libs in lib dir on *nix systems. diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 41f37f44cd..4a88ed28a1 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -3735,8 +3735,8 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel ) ENDIF CASE hbmk[ _HBMK_cPLAT ] == "linux" l_aLIBSYS := ArrayAJoin( { l_aLIBSYS, l_aLIBSYSCORE, l_aLIBSYSMISC } ) - l_aLIBSHARED := { iif( hbmk[ _HBMK_lMT ], "harbourmt" + cDL_Version + cDynLibExt,; - "harbour" + cDL_Version + cDynLibExt ) } + l_aLIBSHARED := { iif( hbmk[ _HBMK_lMT ], cDynLibNamePrefix + "harbourmt" + cDL_Version + cDynLibExt,; + cDynLibNamePrefix + "harbour" + cDL_Version + cDynLibExt ) } ENDCASE IF hbmk[ _HBMK_cPLAT ] $ "win|os2" cBin_Res := "wrc" + hbmk[ _HBMK_cCCEXT ] @@ -4435,6 +4435,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel ) ENDIF l_cIMPLIBNAME := hb_FNameMerge( l_cIMPLIBDIR, cLibLibPrefix + l_cIMPLIBNAME, cImpLibExt ) CASE lStopAfterCComp .AND. hbmk[ _HBMK_lCreateDyn ] + cName := cDynLibNamePrefix + cName IF Empty( cExt ) .AND. ! Empty( cDynLibExt ) hbmk[ _HBMK_cPROGNAME ] := hb_FNameMerge( cDir, cName, cDynLibExt ) ENDIF