From 4c8b170ab5c81c148f11a673c3f09f9dd8ddd4ea Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 11 Sep 2009 08:16:37 +0000 Subject: [PATCH] 2009-09-11 10:16 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * utils/hbmk2/hbmk2.prg ! Fixed missing libprefix handling in lib presence check. This should fix error reported by Pritpal. Thanks. --- harbour/ChangeLog | 5 +++++ harbour/utils/hbmk2/hbmk2.prg | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 04f0bb35ed..ffc112774b 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,11 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-09-11 10:16 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * utils/hbmk2/hbmk2.prg + ! Fixed missing libprefix handling in lib presence check. + This should fix error reported by Pritpal. Thanks. + 2009-09-11 03:52 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * source/rtl/gtxwc/Makefile * source/rtl/gtcrs/Makefile diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 43f712c117..bd7a4f0715 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -3453,10 +3453,10 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 ) ENDIF ENDIF - IF ! Empty( cLIB_BASE_PCRE ) .AND. hb_FileExists( DirAddPathSep( l_cHB_LIB_INSTALL ) + hb_osPathSeparator() + cLIB_BASE_PCRE + cLibLibExt ) + IF ! Empty( cLIB_BASE_PCRE ) .AND. hb_FileExists( DirAddPathSep( l_cHB_LIB_INSTALL ) + hb_osPathSeparator() + cLibLibPrefix + cLIB_BASE_PCRE + cLibLibExt ) AAdd( l_aLIBSYS, cLIB_BASE_PCRE ) ENDIF - IF ! Empty( cLIB_BASE_ZLIB ) .AND. hb_FileExists( DirAddPathSep( l_cHB_LIB_INSTALL ) + hb_osPathSeparator() + cLIB_BASE_ZLIB + cLibLibExt ) + IF ! Empty( cLIB_BASE_ZLIB ) .AND. hb_FileExists( DirAddPathSep( l_cHB_LIB_INSTALL ) + hb_osPathSeparator() + cLibLibPrefix + cLIB_BASE_ZLIB + cLibLibExt ) AAdd( l_aLIBSYS, cLIB_BASE_ZLIB ) ENDIF