2009-10-07 08:09 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

* config/global.mk
  * config/detect.mk
    + Added support for optional user.mk file (requires GNU Make 
      syntax) in Harbour source tree root to store user-specific 
      build settings. In general all documented settings from 
      INSTALL can be used here, but most probably you'll only 
      want to store portable settings (like HB_CONTRIBLIBS). 
      Usually you'll want to use 
        'export HB_BUILD_* := <value>' syntax to specify them.
      user.mk should not rely on any internal variables set 
      by our GNU Make system (like HB_PLATFORM), as they are 
      set later on the process thus not available at this 
      point.
      Please note that this is yet an experience and details 
      or even presence of the feature may change in the future, 
      we should see how useful it turns out to be.
    * Changed conf.mk support, so that the file got renamed 
      to config.mk and moved to source tree root (next to user.mk).

harbour/ChangeLog

@@ -17,6 +17,26 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-10-07 08:09 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * config/global.mk
+  * config/detect.mk
+    + Added support for optional user.mk file (requires GNU Make 
+      syntax) in Harbour source tree root to store user-specific 
+      build settings. In general all documented settings from 
+      INSTALL can be used here, but most probably you'll only 
+      want to store portable settings (like HB_CONTRIBLIBS). 
+      Usually you'll want to use 
+        'export HB_BUILD_* := <value>' syntax to specify them.
+      user.mk should not rely on any internal variables set 
+      by our GNU Make system (like HB_PLATFORM), as they are 
+      set later on the process thus not available at this 
+      point.
+      Please note that this is yet an experience and details 
+      or even presence of the feature may change in the future, 
+      we should see how useful it turns out to be.
+    * Changed conf.mk support, so that the file got renamed 
+      to config.mk and moved to source tree root (next to user.mk).
+
 2009-10-07 07:36 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbct/ctwin.c
     + Added HB_C52_STRICT guard around artificial windows 

harbour/config/detect.mk

@@ -38,7 +38,7 @@ endif
 
 # Allow detection by external (generated) config file
 
--include $(TOP)$(ROOT)config/conf.mk
+-include $(TOP)$(ROOT)config.mk
 
 # Detect zlib
 

harbour/config/global.mk

@@ -30,6 +30,8 @@
 ifeq ($(GLOBAL_MK_),)
 GLOBAL_MK_ := yes
 
+-include $(TOP)$(ROOT)user.mk
+
 HB_VER_MAJOR     := 2
 HB_VER_MINOR     := 0
 HB_VER_RELEASE   := 0