From f7012a0401e694f2da6cdb1f6c8e244025e6fe1b Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Thu, 4 Jun 2009 11:26:26 +0000 Subject: [PATCH] 2009-06-04 13:26 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * utils/hbmk2/hbmk2.prg + Added support for macros (including envvars) for .hbc references. F.e.: hbmk2 [...] ${MYLIB_DIR}/mylib.hbc [...] --- harbour/ChangeLog | 5 +++++ harbour/utils/hbmk2/hbmk2.prg | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 1b4a3f862b..9fa12124ee 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,11 @@ past entries belonging to these authors: Viktor Szakats. */ +2009-06-04 13:26 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * utils/hbmk2/hbmk2.prg + + Added support for macros (including envvars) for .hbc references. + F.e.: hbmk2 [...] ${MYLIB_DIR}/mylib.hbc [...] + 2009-06-04 09:23 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * source/compiler/hbusage.c + Added contributors present on the crew list only. diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 0b8fb8bc3a..b2458467f0 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -1625,7 +1625,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 ) CASE FN_ExtGet( cParamL ) == ".hbc" - cParam := PathProc( cParam, aParam[ _PAR_cFileName ] ) + cParam := PathProc( MacroProc( hbmk, ArchCompFilter( hbmk, cParam ), FN_DirGet( aParam[ _PAR_cFileName ] ) ), aParam[ _PAR_cFileName ] ) IF ! hb_FileExists( cParam ) FOR EACH tmp IN hbmk[ _HBMK_aLIBPATH ]