From 3b929ea65ed890cd852987b1de93ff3b748fac6b Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Sat, 19 Dec 2009 12:47:02 +0000
Subject: [PATCH] 2009-12-19 13:45 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * utils/hbmk2/hbmk2.prg   * config/global.mk     ! Not
 considering /opt and /opt/harbour as "system location" for       Harbour,
 following Lorenzo's advice.

---
 harbour/ChangeLog             | 6 ++++++
 harbour/config/global.mk      | 2 +-
 harbour/utils/hbmk2/hbmk2.prg | 2 --
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 378be652c2..1e3b1e038f 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,12 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-12-19 13:45 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/hbmk2.prg
+  * config/global.mk
+    ! Not considering /opt and /opt/harbour as "system location" for
+      Harbour, following Lorenzo's advice.
+
 2009-12-19 13:34 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * src/rtl/sha2.c
     ! Added trick to make it compile with Pelles C 6.00.6.
diff --git a/harbour/config/global.mk b/harbour/config/global.mk
index 742996b20e..c920e4249c 100644
--- a/harbour/config/global.mk
+++ b/harbour/config/global.mk
@@ -1233,7 +1233,7 @@ ifeq ($(HB_PLATFORM),beos)
       HB_SYSLOC := yes
    endif
 else ifneq ($(HB_PLATFORM_UNIX),)
-   ifneq ($(strip $(foreach dir,/usr/local/bin /usr/bin /opt/harbour /opt/bin $(subst :, ,$(LD_LIBRARY_PATH)),$(findstring |$(dir),|$(HB_INSTALL_PREFIX)))),)
+   ifneq ($(strip $(foreach dir,/usr/local/bin /usr/bin $(subst :, ,$(LD_LIBRARY_PATH)),$(findstring |$(dir),|$(HB_INSTALL_PREFIX)))),)
       HB_SYSLOC := yes
    endif
 endif
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index ab1e732758..3749770d34 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -1145,8 +1145,6 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
          ELSE
             lSysLoc := LEFTEQUAL( l_cHB_BIN_INSTALL, "/usr/local/bin" ) .OR. ;
                        LEFTEQUAL( l_cHB_BIN_INSTALL, "/usr/bin"       ) .OR. ;
-                       LEFTEQUAL( l_cHB_BIN_INSTALL, "/opt/harbour"   ) .OR. ;
-                       LEFTEQUAL( l_cHB_BIN_INSTALL, "/opt/bin"       ) .OR. ;
                        AScan( ListToArray( GetEnv( "LD_LIBRARY_PATH" ), ":" ), {| tmp | LEFTEQUAL( l_cHB_LIB_INSTALL, tmp ) } ) > 0
          ENDIF
       #else