From d732688cc98557793e393f2f18b73b4db364a6a5 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 4 Apr 2012 14:33:59 +0000 Subject: [PATCH] 2012-04-04 16:33 UTC+0200 Viktor Szakats (harbour syenar.net) * utils/hbmk2/hbmk2.prg * better fix --- harbour/ChangeLog | 4 ++++ harbour/utils/hbmk2/hbmk2.prg | 6 ++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index b8717713d7..def33d64c0 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,10 @@ The license applies to all entries newer than 2009-04-28. */ +2012-04-04 16:33 UTC+0200 Viktor Szakats (harbour syenar.net) + * utils/hbmk2/hbmk2.prg + * better fix + 2012-04-04 16:30 UTC+0200 Viktor Szakats (harbour syenar.net) * utils/hbmk2/hbmk2.prg ! fixed RTE in prev when lib/3rd is not present diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 3f3348ef2a..6dd9103ad8 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -787,7 +787,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel ) LOCAL l_cHB_INSTALL_PREFIX LOCAL l_cHB_INSTALL_BIN LOCAL l_cHB_INSTALL_LIB - LOCAL l_cHB_INSTALL_LI3 + LOCAL l_cHB_INSTALL_LI3 := "" LOCAL l_cHB_INSTALL_DYN LOCAL l_cHB_INSTALL_INC LOCAL l_cHB_INSTALL_ADD @@ -1957,11 +1957,9 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel ) keep above code parts easier to read. [vszakats] */ hbmk[ _HBMK_cHB_INSTALL_BIN ] := l_cHB_INSTALL_BIN := hb_DirSepDel( PathSepToSelf( l_cHB_INSTALL_BIN ) ) hbmk[ _HBMK_cHB_INSTALL_LIB ] := l_cHB_INSTALL_LIB := hb_DirSepDel( PathSepToSelf( l_cHB_INSTALL_LIB ) ) + hbmk[ _HBMK_cHB_INSTALL_LI3 ] := l_cHB_INSTALL_LI3 := hb_DirSepDel( PathSepToSelf( l_cHB_INSTALL_LI3 ) ) hbmk[ _HBMK_cHB_INSTALL_DYN ] := l_cHB_INSTALL_DYN := hb_DirSepDel( PathSepToSelf( l_cHB_INSTALL_DYN ) ) hbmk[ _HBMK_cHB_INSTALL_INC ] := l_cHB_INSTALL_INC := hb_DirSepDel( PathSepToSelf( l_cHB_INSTALL_INC ) ) - IF ! Empty( l_cHB_INSTALL_LI3 ) - hbmk[ _HBMK_cHB_INSTALL_LI3 ] := l_cHB_INSTALL_LI3 := hb_DirSepDel( PathSepToSelf( l_cHB_INSTALL_LI3 ) ) - ENDIF /* Add main Harbour library dir to lib path list */ AAddNotEmpty( hbmk[ _HBMK_aLIBPATH ], l_cHB_INSTALL_LIB )