From 4ff8a0a513c87cb840e306983a7bd755cdf9c3a5 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Thu, 16 Jul 2009 13:00:14 +0000
Subject: [PATCH] 2009-07-16 14:57 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * config/global.cf     ! Switched to use HB_FLAGSEXTRA for
 __PLATFORM__ macros instead       of cumulating HB_USER_PRGFLAGS. It didn't
 work in linux/watcom       builds from win hosts. This way also HB_HOST_FLAG_
 isn't needed.

  * config/wce/global.cf
    - Deleted commented HB_FLAGSEXTRA line.

  * source/hbpcre/_hbconf.h
    * Minor formatting.
---
 harbour/ChangeLog               | 12 +++++++++
 harbour/config/global.cf        | 45 ++++++++++++++++-----------------
 harbour/config/wce/global.cf    |  2 --
 harbour/source/hbpcre/_hbconf.h |  2 +-
 4 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 83aa71ab1d..971857f6bb 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,18 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-07-16 14:57 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * config/global.cf
+    ! Switched to use HB_FLAGSEXTRA for __PLATFORM__ macros instead
+      of cumulating HB_USER_PRGFLAGS. It didn't work in linux/watcom
+      builds from win hosts. This way also HB_HOST_FLAG_ isn't needed.
+
+  * config/wce/global.cf
+    - Deleted commented HB_FLAGSEXTRA line.
+
+  * source/hbpcre/_hbconf.h
+    * Minor formatting.
+
 2009-07-16 14:19 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/config/global.cf
     ! yet another fix for exporting relative paths in HB_BIN_COMPILE
diff --git a/harbour/config/global.cf b/harbour/config/global.cf
index b21517300a..a57f6c664c 100644
--- a/harbour/config/global.cf
+++ b/harbour/config/global.cf
@@ -213,29 +213,28 @@ ifneq ($(HB_HOST_ARCH)$(HB_HOST_CPU),$(HB_ARCHITECTURE)$(HB_CPU))
          endif
       endif
    endif
-   ifneq ($(HB_HOST_FLAG_),done)
-      export HB_HOST_FLAG_=done
-      # Setup platform macros (undefine host, define target)
-      ifeq      ($(HB_HOST_ARCH),win)
-         HB_USER_PRGFLAGS += -undef:__PLATFORM__WINDOWS
-      else ifeq ($(HB_HOST_ARCH),dos)
-         HB_USER_PRGFLAGS += -undef:__PLATFORM__DOS
-      else ifeq ($(HB_HOST_ARCH),os2)
-         HB_USER_PRGFLAGS += -undef:__PLATFORM__OS2
-      else ifeq ($(HB_HOST_ARCH),linux)
-         HB_USER_PRGFLAGS += -undef:__PLATFORM__LINUX -undef:__PLATFORM__UNIX
-      endif
-      ifeq      ($(HB_ARCHITECTURE),win)
-         HB_USER_PRGFLAGS += -D__PLATFORM__WINDOWS
-      else ifeq ($(HB_ARCHITECTURE),wce)
-         HB_USER_PRGFLAGS += -D__PLATFORM__WINDOWS -D__PLATFORM__WINCE
-      else ifeq ($(HB_ARCHITECTURE),dos)
-         HB_USER_PRGFLAGS += -D__PLATFORM__DOS
-      else ifeq ($(HB_ARCHITECTURE),os2)
-         HB_USER_PRGFLAGS += -D__PLATFORM__OS2
-      else ifeq ($(HB_ARCHITECTURE),linux)
-         HB_USER_PRGFLAGS += -D__PLATFORM__LINUX -D__PLATFORM__UNIX
-      endif
+
+   # Setup platform macros (undefine host, define target)
+   HB_FLAGSEXTRA :=
+   ifeq      ($(HB_HOST_ARCH),win)
+      HB_FLAGSEXTRA += -undef:__PLATFORM__WINDOWS
+   else ifeq ($(HB_HOST_ARCH),dos)
+      HB_FLAGSEXTRA += -undef:__PLATFORM__DOS
+   else ifeq ($(HB_HOST_ARCH),os2)
+      HB_FLAGSEXTRA += -undef:__PLATFORM__OS2
+   else ifeq ($(HB_HOST_ARCH),linux)
+      HB_FLAGSEXTRA += -undef:__PLATFORM__LINUX -undef:__PLATFORM__UNIX
+   endif
+   ifeq      ($(HB_ARCHITECTURE),win)
+      HB_FLAGSEXTRA += -D__PLATFORM__WINDOWS
+   else ifeq ($(HB_ARCHITECTURE),wce)
+      HB_FLAGSEXTRA += -D__PLATFORM__WINDOWS -D__PLATFORM__WINCE
+   else ifeq ($(HB_ARCHITECTURE),dos)
+      HB_FLAGSEXTRA += -D__PLATFORM__DOS
+   else ifeq ($(HB_ARCHITECTURE),os2)
+      HB_FLAGSEXTRA += -D__PLATFORM__OS2
+   else ifeq ($(HB_ARCHITECTURE),linux)
+      HB_FLAGSEXTRA += -D__PLATFORM__LINUX -D__PLATFORM__UNIX
    endif
 endif
 
diff --git a/harbour/config/wce/global.cf b/harbour/config/wce/global.cf
index fd7140255a..83895bcfe6 100644
--- a/harbour/config/wce/global.cf
+++ b/harbour/config/wce/global.cf
@@ -9,8 +9,6 @@ HB_GT_LIBS += gtwvt gtgui
 # Favor size for CE builds.
 HB_GCMODE = 0
 
-#HB_FLAGSEXTRA = -D__PLATFORM__WINCE
-
 ifeq ($(HB_DYNLIB),yes)
    HB_CDYNLIB = -DHB_DYNLIB
 endif
diff --git a/harbour/source/hbpcre/_hbconf.h b/harbour/source/hbpcre/_hbconf.h
index 584e1c3dfe..b3e21c7cc4 100644
--- a/harbour/source/hbpcre/_hbconf.h
+++ b/harbour/source/hbpcre/_hbconf.h
@@ -5,7 +5,7 @@
 #ifndef HB_CONFIG_H
 #define HB_CONFIG_H
 
-#if !defined(HB_DYNLIB)
+#if !defined( HB_DYNLIB )
    #define PCRE_STATIC
 #endif