From 2f5e3e1201dc39b893e9ecf18cd125b19af38317 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 16 Jun 2012 16:00:21 +0000 Subject: [PATCH] 2012-06-16 17:59 UTC+0200 Viktor Szakats (harbour syenar.net) * utils/hbmk2/hbmk2.prg ! ignore HB_INSTALL_* envvars too in runner mode --- harbour/ChangeLog | 4 ++++ harbour/utils/hbmk2/hbmk2.prg | 9 ++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index f0638cb699..0b73c5a9f4 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,10 @@ The license applies to all entries newer than 2009-04-28. */ +2012-06-16 17:59 UTC+0200 Viktor Szakats (harbour syenar.net) + * utils/hbmk2/hbmk2.prg + ! ignore HB_INSTALL_* envvars too in runner mode + 2012-06-16 16:48 UTC+0200 Viktor Szakats (harbour syenar.net) * contrib/hbamf/hbamfobj.prg * made it more friendly with grep when finding undocumented functions diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 1fa5367091..cc32fcf60b 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -938,14 +938,17 @@ STATIC FUNCTION hbmk_harbour_dirlayout_detect( hbmk, /* @ */ l_cHB_INSTALL_PREFI hbmk[ _HBMK_cHB_INSTALL_LI3 ] := "" - hbmk[ _HBMK_cHB_INSTALL_BIN ] := PathSepToSelf( GetEnv( "HB_INSTALL_BIN" ) ) - hbmk[ _HBMK_cHB_INSTALL_LIB ] := PathSepToSelf( GetEnv( "HB_INSTALL_LIB" ) ) - hbmk[ _HBMK_cHB_INSTALL_INC ] := PathSepToSelf( GetEnv( "HB_INSTALL_INC" ) ) IF lIgnoreEnvVar l_cHB_INSTALL_PREFIX := "" + hbmk[ _HBMK_cHB_INSTALL_BIN ] := "" + hbmk[ _HBMK_cHB_INSTALL_LIB ] := "" + hbmk[ _HBMK_cHB_INSTALL_INC ] := "" ELSE l_cHB_INSTALL_PREFIX := MacroProc( hbmk, PathSepToSelf( GetEnv( "HB_INSTALL_PREFIX" ) ), NIL, _MACRO_NO_PREFIX ) + hbmk[ _HBMK_cHB_INSTALL_BIN ] := PathSepToSelf( GetEnv( "HB_INSTALL_BIN" ) ) + hbmk[ _HBMK_cHB_INSTALL_LIB ] := PathSepToSelf( GetEnv( "HB_INSTALL_LIB" ) ) + hbmk[ _HBMK_cHB_INSTALL_INC ] := PathSepToSelf( GetEnv( "HB_INSTALL_INC" ) ) ENDIF IF Empty( l_cHB_INSTALL_PREFIX ) l_cHB_INSTALL_PREFIX := hb_DirSepAdd( hb_DirBase() ) + ".."