From b40f400352b4db836ee2551076df34a4a8848eeb Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 2 Mar 2012 10:28:22 +0000 Subject: [PATCH] 2012-03-02 11:27 UTC+0100 Viktor Szakats (harbour syenar.net) * utils/hbmk2/hbmk2.prg * tuned Harbour root autodetection code to avoid corner case where another Harbour installation is present one or two dir levels upper in the tree. Regressions are possible. Please test. --- harbour/ChangeLog | 7 +++++++ harbour/utils/hbmk2/hbmk2.prg | 7 +++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 9db051df1b..00f7b15cc8 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,13 @@ The license applies to all entries newer than 2009-04-28. */ +2012-03-02 11:27 UTC+0100 Viktor Szakats (harbour syenar.net) + * utils/hbmk2/hbmk2.prg + * tuned Harbour root autodetection code to avoid corner + case where another Harbour installation is present one + or two dir levels upper in the tree. + Regressions are possible. Please test. + 2012-02-29 09:58 UTC+0100 Viktor Szakats (harbour syenar.net) * utils/hbmk2/hbmk2.prg + show .hbp file reference when .hbc is not found diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 019ce55852..6a2fbbeef5 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -1515,9 +1515,12 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel ) l_cHB_INSTALL_PREFIX := hb_DirSepAdd( hb_DirBase() ) + ".." ENDIF - /* Detect special non-installed dir layout (after simple 'make') */ - IF hb_FileExists( hb_DirSepAdd( l_cHB_INSTALL_PREFIX ) + ".." + hb_ps() + ".." + hb_ps() + "include" +; + IF hb_FileExists( hb_DirSepAdd( l_cHB_INSTALL_PREFIX ) + "include" +; hb_ps() + "hbvm.h" ) + /* do nothing */ + /* Detect special non-installed dir layout (after simple 'make') */ + ELSEIF hb_FileExists( hb_DirSepAdd( l_cHB_INSTALL_PREFIX ) + ".." + hb_ps() + ".." + hb_ps() + "include" +; + hb_ps() + "hbvm.h" ) l_cHB_INSTALL_PREFIX := hb_DirSepAdd( l_cHB_INSTALL_PREFIX ) + ".." + hb_ps() + ".." + hb_ps() /* Detect special multi-host dir layout */ ELSEIF hb_FileExists( hb_DirSepAdd( l_cHB_INSTALL_PREFIX ) + ".." + hb_ps() + "include" +;