diff --git a/harbour/ChangeLog b/harbour/ChangeLog index bd6eb42208..75fb807da1 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,11 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-11-15 08:37 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * utils/hbmk2/hbmk2.prg + ! Fixed typo causing build-time flags to not be recognized + when using embedded Harbour compiler and -bldf option. + 2009-11-15 08:21 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * src/rtl/hbi18n1.c ! Fixed bcc warning in recent commit. diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 4dfdfaf417..edcb61f6b4 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -3450,7 +3450,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause ) FOR EACH aTODO IN ArraySplit( l_aPRG_TODO, l_nJOBS ) aCommand := ArrayAJoin( { { iif( hbmk[ _HBMK_lCreateLib ] .OR. hbmk[ _HBMK_lCreateDyn ], "-n1", "-n2" ) },; aTODO,; - iif( hbmk[ _HBMK_lBLDFLGP ], { " " + hb_Version( HB_VERSION_FLAG_PRG ) }, {} ),; + iif( hbmk[ _HBMK_lBLDFLGP ], { hb_Version( HB_VERSION_FLAG_PRG ) }, {} ),; ListToArray( iif( ! Empty( GetEnv( "HB_USER_PRGFLAGS" ) ), " " + GetEnv( "HB_USER_PRGFLAGS" ), "" ) ),; hbmk[ _HBMK_aOPTPRG ] } ) @@ -4782,7 +4782,7 @@ STATIC FUNCTION FindNewerHeaders( hbmk, cFileName, cParentDir, tTimeParent, lInc aCommand := ArrayAJoin( { { "-q0", "-sm" },; { iif( hbmk[ _HBMK_lCreateLib ] .OR. hbmk[ _HBMK_lCreateDyn ], "-n1", "-n2" ) },; { cFileName },; - iif( hbmk[ _HBMK_lBLDFLGP ], { " " + hb_Version( HB_VERSION_FLAG_PRG ) }, {} ),; + iif( hbmk[ _HBMK_lBLDFLGP ], { hb_Version( HB_VERSION_FLAG_PRG ) }, {} ),; ListToArray( iif( ! Empty( GetEnv( "HB_USER_PRGFLAGS" ) ), " " + GetEnv( "HB_USER_PRGFLAGS" ), "" ) ),; hbmk[ _HBMK_aOPTPRG ] } )