diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 38a76de592..71f46cffb6 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,12 @@ The license applies to all entries newer than 2009-04-28. */ +2012-10-09 19:49 UTC+0200 Viktor Szakats (harbour syenar.net) + * utils/hbmk2/hbmk2.prg + ! minor fix to prev to properly parent built-in hbm files + included in hbmk.hbm + ! deleted accindentally left debug output + 2012-10-09 19:45 UTC+0200 Viktor Szakats (harbour syenar.net) * ChangeLog ! typo in prev commit description diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 7b8cdd235b..1ff4935db6 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -2197,7 +2197,7 @@ FUNCTION hbmk( aArgs, nArgTarget, /* @ */ lPause, nLevel ) IF ! hbmk[ _HBMK_lQuiet ] _hbmk_OutStd( hbmk, hb_StrFormat( I_( "Processing local make script: %1$s" ), _HBMK_AUTOHBM_NAME ) ) ENDIF - HBM_Load( hbmk, aParams, _HBMK_AUTOHBM_NAME, 1, .F. ) /* Do not allow sub-projects in automatic make file */ + HBM_Load( hbmk, aParams, _HBMK_AUTOHBM_NAME, 1, .F., _HBMK_AUTOHBM_NAME ) /* Do not allow sub-projects in automatic make file */ ENDIF /* Collect all command line parameters */ @@ -10247,11 +10247,8 @@ STATIC FUNCTION HBM_Load( hbmk, aParams, cFileName, nNestingLevel, lProcHBP, cPa cFile := hbmk_builtin_Load( cFileName ) /* Built-in files will act as if they were part of the parant file, since their name is fixed and have no useful meaning whatsoever. */ - OUTSTD( "Buildin file" + hb_eol() ) IF ! Empty( cParentFileName ) - OUTSTD( "Rebasing from: " + cFileName + hb_eol() ) cFileName := cParentFileName - OUTSTD( "Rebasing to " + cFileName + hb_eol() ) ENDIF ELSE cFile := hbmk_MemoRead( cFileName ) /* NOTE: Intentionally using hbmk_MemoRead() which handles EOF char. */