From 5209383fc126933ba6d4530992a5096b5af7b3b7 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 20 Apr 2009 11:02:58 +0000 Subject: [PATCH] 2009-04-20 13:02 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * utils/hbmk2/hbmk2.prg ! Fixed wildcarded input files to handle directory component. --- harbour/ChangeLog | 4 ++++ harbour/utils/hbmk2/hbmk2.prg | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 2bd393e767..5ef098e1a1 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,10 @@ 2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-04-20 13:02 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * utils/hbmk2/hbmk2.prg + ! Fixed wildcarded input files to handle directory component. + 2009-04-20 12:46 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * utils/hbmk2/hbmk2.prg + Made possible to use -hbdyn/-hblib options in .hbm files. diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 0bdf50517a..b03a3a63a0 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -3726,7 +3726,7 @@ STATIC FUNCTION FN_Expand( cFileName ) aDir := Directory( cFileName ) FOR EACH aFile IN aDir IF FN_ExtGet( aFile[ F_NAME ] ) == cExt /* Workaround to not find 'hello.prga' when looking for '*.prg' */ - AAdd( aFilelist, aFile[ F_NAME ] ) + AAdd( aFilelist, hb_FNameMerge( FN_DirGet( cFileName ), aFile[ F_NAME ] ) ) ENDIF NEXT