From 836eecac3b35f86f83c036d006e2fcb000ae5973 Mon Sep 17 00:00:00 2001
From: Przemyslaw Czerpak <druzus@priv.onet.pl>
Date: Fri, 2 Oct 2009 14:53:49 +0000
Subject: [PATCH] 2009-10-02 16:53 UTC+0200 Przemyslaw Czerpak
 (druzus/at/priv.onet.pl)   * harbour/mpkg_src.sh     ! fixed default root
 path settings after moving the file from bin       directory

  * harbour/include/hbdefs.h
    ! fixed Linux GCC 2.XX builds

  * harbour/harbour.spec
    ! added missing export in build settings
---
 harbour/ChangeLog        | 11 +++++++++++
 harbour/harbour.spec     |  2 +-
 harbour/include/hbdefs.h |  2 +-
 harbour/mpkg_src.sh      |  1 -
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 79c5f75b79..9cd76cb103 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,17 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-10-02 16:53 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/mpkg_src.sh
+    ! fixed default root path settings after moving the file from bin
+      directory
+
+  * harbour/include/hbdefs.h
+    ! fixed Linux GCC 2.XX builds
+
+  * harbour/harbour.spec
+    ! added missing export in build settings
+
 2009-10-02 15:14 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/source/rdd/dbf1.c
     ! two fixes for 32bit record numbers
diff --git a/harbour/harbour.spec b/harbour/harbour.spec
index 02343a96b3..81f35aadbd 100644
--- a/harbour/harbour.spec
+++ b/harbour/harbour.spec
@@ -77,7 +77,7 @@
 %define hb_crs   export HB_WITH_CURSES=%{!?_without_gtcrs:yes}%{?_without_gtcrs:no}
 %define hb_sln   export HB_WITH_SLANG=%{!?_without_gtsln:yes}%{?_without_gtsln:no}
 %define hb_x11   export HB_WITH_X11=%{!?_without_x11:yes}%{?_without_x11:no}
-%define hb_local export HB_WITH_ZLIB=%{?_with_localzlib:local} ; HB_WITH_PCRE=%{?_with_localpcre:local}
+%define hb_local export HB_WITH_ZLIB=%{?_with_localzlib:local} ; export HB_WITH_PCRE=%{?_with_localpcre:local}
 %define hb_bdir  export HB_BIN_INSTALL=%{_bindir}
 %define hb_idir  export HB_INC_INSTALL=%{_includedir}/%{name}
 %define hb_ldir  export HB_LIB_INSTALL=%{_libdir}/%{name}
diff --git a/harbour/include/hbdefs.h b/harbour/include/hbdefs.h
index c477c9d4f9..3e1736de68 100644
--- a/harbour/include/hbdefs.h
+++ b/harbour/include/hbdefs.h
@@ -1532,7 +1532,7 @@ typedef long                hbVMIntMax;       /* TOFIX */
    #elif defined( __GNUC__ ) && defined( HB_OS_WIN )
       #define HB_EXPORT __attribute__ (( dllexport ))
 
-   #elif defined( __GNUC__ ) && defined( HB_OS_LINUX )
+   #elif defined( __GNUC__ ) && defined( HB_OS_LINUX ) && __GNUC__ >= 3
       #define HB_EXPORT __attribute__ ((visibility ("default")))
 
    #elif defined( __BORLANDC__ )
diff --git a/harbour/mpkg_src.sh b/harbour/mpkg_src.sh
index 7a0f03af25..dd14597824 100755
--- a/harbour/mpkg_src.sh
+++ b/harbour/mpkg_src.sh
@@ -28,7 +28,6 @@ if [ -f bin/hb-func.sh ]; then
   hb_rootdir="."
 else
   hb_rootdir=`dirname $0`
-  hb_rootdir="${hb_rootdir}/.."
 fi
 . ${hb_rootdir}/bin/hb-func.sh