From 685f3c6511bff3fc476842fe259b2ebdb5efb4bd Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 15 Jun 2009 14:33:30 +0000 Subject: [PATCH] 2009-06-15 16:32 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * utils/hbmk2/hbmk2.prg ! Fixed extension-less parameters not recognized as .prg on dos platform. (they were picked as libs due to extension match with empty dynamic lib extension) Thanks to Przemek for the report. --- harbour/ChangeLog | 8 ++++++++ harbour/utils/hbmk2/hbmk2.prg | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index e8e24347c5..f002d7ceff 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,14 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-06-15 16:32 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * utils/hbmk2/hbmk2.prg + ! Fixed extension-less parameters not recognized as .prg + on dos platform. + (they were picked as libs due to extension match with + empty dynamic lib extension) + Thanks to Przemek for the report. + 2009-06-15 15:45 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbwin/legacy.prg + Added legacy CREATEOLEOBJECT() call support. diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 138885cc25..fcd973fb25 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -1679,7 +1679,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 ) ENDCASE CASE FN_ExtGet( cParamL ) == ".lib" .OR. ; - FN_ExtGet( cParamL ) == cDynLibExt + ( ! Empty( cDynLibExt ) .AND. FN_ExtGet( cParamL ) == cDynLibExt ) cParam := ArchCompFilter( hbmk, cParam ) IF ! Empty( cParam )