From ed11101b2edc9d3445ad5743596757eaa190b891 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 1 May 2009 18:13:08 +0000 Subject: [PATCH] 2009-05-01 20:12 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * utils/hbmk2/hbmk2.prg ! hbmk2 -> hbmk --- harbour/ChangeLog | 4 ++++ harbour/utils/hbmk2/hbmk2.prg | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index f6aa8bfc2e..49d255685d 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,10 @@ past entries belonging to these authors: Viktor Szakats. */ +2009-05-01 20:12 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * utils/hbmk2/hbmk2.prg + ! hbmk2 -> hbmk + 2009-05-01 20:09 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * ChangeLog ! Typo in old i18n entry. diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index a17c80106f..d8d50b8f61 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -3521,7 +3521,7 @@ STATIC FUNCTION LibExists( cDir, cLib, cLibExt ) DO CASE CASE s_cCOMP $ "gcc|gpp|mingw|mingw64|mingwarm|cygwin" .AND. s_cARCH $ "win|wce" /* NOTE: ld/gcc option -dll-search-prefix isn't taken into account here, - So, 'xxx.dll' format libs won't be found by hbmk2. */ + So, 'xxx.dll' format libs won't be found by hbmk. */ DO CASE CASE hb_FileExists( tmp := cDir + "lib" + FN_ExtSet( cLib, ".dll.a" ) ) ; RETURN tmp CASE hb_FileExists( tmp := cDir + FN_ExtSet( cLib, ".dll.a" ) ) ; RETURN tmp @@ -4849,7 +4849,7 @@ STATIC FUNCTION rtlnk_process( cCommands, cFileOut, aFileList, aLibList, ; IF nMode == RTLNK_MODE_NONE /* blinker extension */ IF Upper( cLine ) = "ECHO " - OutStd( hb_StrFormat( I_( "hbmk2: Blinker ECHO: %1$s" ), SubStr( cLine, 6 ) ), hb_osNewLine() ) + OutStd( hb_StrFormat( I_( "hbmk: Blinker ECHO: %1$s" ), SubStr( cLine, 6 ) ), hb_osNewLine() ) LOOP ELSEIF Upper( cLine ) = "BLINKER " /* skip blinker commands */ @@ -4889,7 +4889,7 @@ STATIC FUNCTION rtlnk_process( cCommands, cFileOut, aFileList, aLibList, ; cWord := SubStr( cWord, 2 ) cCommands := rtlnk_read( @cWord, aPrevFiles ) IF cCommands == NIL - OutStd( hb_StrFormat( I_( "hbmk2: error: Cannot open file: %1$s" ), cWord ), hb_osNewLine() ) + OutStd( hb_StrFormat( I_( "hbmk: error: Cannot open file: %1$s" ), cWord ), hb_osNewLine() ) RETURN .F. ENDIF IF !rtlnk_process( cCommands, @cFileOut, @aFileList, @aLibList, ;