From 2faf4f310fc5062c1902ab25722910ba8017dceb Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Mon, 10 Aug 2009 01:10:55 +0000
Subject: [PATCH] 2009-08-10 03:09 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * config/global.cf   * config/lib.cf   * config/bin.cf   *
 config/test.cf     ! Inclusion of compiler specific rules now happens from
 [lib|bin|test].cf.       This way it plays well with scenarios where
 global.cf is directly       included in Makefiles. It should also be slightly
 more efficient.

---
 harbour/ChangeLog        | 15 ++++++++++++---
 harbour/config/bin.cf    |  1 +
 harbour/config/global.cf |  1 -
 harbour/config/lib.cf    |  1 +
 harbour/config/test.cf   |  1 +
 5 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 994c8e4430..3cd53b73d9 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,15 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-08-10 03:09 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * config/global.cf
+  * config/lib.cf
+  * config/bin.cf
+  * config/test.cf
+    ! Inclusion of compiler specific rules now happens from [lib|bin|test].cf.
+      This way it plays well with scenarios where global.cf is directly
+      included in Makefiles. It should also be slightly more efficient.
+
 2009-08-10 02:39 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * config/globsh.cf
   * config/bsd/gcc.cf
@@ -124,9 +133,9 @@
 2009-08-09 21:42 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * config/global.cf
     ! Fixed 'sh' HB_SHELL detection. Problem experienced with
-       Cygwin GNU Make, where SHLVL isn't defined on the first
-       level. Now also checking for SHELL=/bin/sh to detect sh
-       shell.
+      Cygwin GNU Make, where SHLVL isn't defined on the first
+      level. Now also checking for SHELL=/bin/sh to detect sh
+      shell.
 
   * tests/multifnc/Makefile
   * external/sqlite3/Makefile
diff --git a/harbour/config/bin.cf b/harbour/config/bin.cf
index 07bf66991d..690ea7f465 100644
--- a/harbour/config/bin.cf
+++ b/harbour/config/bin.cf
@@ -7,6 +7,7 @@ include $(TOP)$(ROOT)config/global.cf
 ifneq ($(HB_ARCHITECTURE),)
 ifneq ($(HB_COMPILER),)
 
+include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/$(HB_COMPILER).cf
 include $(TOP)$(ROOT)config/c.cf
 include $(TOP)$(ROOT)config/prg.cf
 
diff --git a/harbour/config/global.cf b/harbour/config/global.cf
index ab844617e6..71b8d1d2e0 100644
--- a/harbour/config/global.cf
+++ b/harbour/config/global.cf
@@ -700,7 +700,6 @@ export HB_HOST_BIN_DIR
 
 include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/global.cf
 include $(TOP)$(ROOT)config/globsh.cf
-include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/$(HB_COMPILER).cf
 
 endif
 
diff --git a/harbour/config/lib.cf b/harbour/config/lib.cf
index 7d0c733e9b..4ed94739ec 100644
--- a/harbour/config/lib.cf
+++ b/harbour/config/lib.cf
@@ -7,6 +7,7 @@ include $(TOP)$(ROOT)config/global.cf
 ifneq ($(HB_ARCHITECTURE),)
 ifneq ($(HB_COMPILER),)
 
+include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/$(HB_COMPILER).cf
 include $(TOP)$(ROOT)config/c.cf
 include $(TOP)$(ROOT)config/prg.cf
 
diff --git a/harbour/config/test.cf b/harbour/config/test.cf
index 0dc42ace61..d0c9dbca70 100644
--- a/harbour/config/test.cf
+++ b/harbour/config/test.cf
@@ -7,6 +7,7 @@ include $(TOP)$(ROOT)config/global.cf
 ifneq ($(HB_ARCHITECTURE),)
 ifneq ($(HB_COMPILER),)
 
+include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/$(HB_COMPILER).cf
 include $(TOP)$(ROOT)config/prg.cf
 
 first:: dirbase ^^^d^e^s^c^e^n^d^^^