From 83a01da182c19ba18137cd434ad71f230453899a Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Wed, 2 Jun 2010 17:01:12 +0000
Subject: [PATCH] 2010-06-02 19:00 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * utils/hbmk2/hbmk2.prg     + Added information about standard
 header locations (as comment yet).     * Minor change: HBMK2_HAS_* ->
 HBMK_HAS_*

---
 harbour/ChangeLog             |  5 +++++
 harbour/utils/hbmk2/hbmk2.prg | 22 +++++++++++++++++++++-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index f25fcf8643..381a590b6a 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,11 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-06-02 19:00 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/hbmk2.prg
+    + Added information about standard header locations (as comment yet).
+    * Minor change: HBMK2_HAS_* -> HBMK_HAS_*
+
 2010-06-02 18:52 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/src/pp/pplib.c
   * harbour/src/vm/estack.c
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index e24aeca4b5..6f324f1603 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -210,6 +210,9 @@ REQUEST hbmk_KEYW
 #define _HBMK_CFG_NAME          "hbmk.cfg"
 #define _HBMK_AUTOHBM_NAME      "hbmk.hbm"
 
+#define _HBMK_WITH_PREF         "HBMK_WITH_"
+#define _HBMK_HAS_PREF          "HBMK_HAS_"
+
 #define _HBMK_NEST_MAX          10
 #define _HBMK_HEAD_NEST_MAX     10
 
@@ -2392,6 +2395,23 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
    ENDIF
 
    IF ! lStopAfterInit .AND. ! lStopAfterHarbour
+
+      /*
+         /boot/common/include                        (beos)
+         /boot/develop/headers/3rdparty              (beos)
+
+         /opt/local/include                          (darwin MacPorts)
+         /sw/include                                 (darwin Fink)
+         /Library/Frameworks/<pkg>.framework/Headers (darwin)
+
+         /usr/<pkg>/include                          (FHS)
+         /usr/include                                (FHS)
+         /opt/<pkg>/include                          (FHS)
+         /opt/include                                (FHS)
+         /usr/local/<pkg>/include                    (FHS)
+         /usr/local/include                          (FHS)
+      */
+
       /* Process any package requirements */
       FOR EACH tmp IN hbmk[ _HBMK_aREQPKG ]
          pkg_try_detection( hbmk, tmp )
@@ -5928,7 +5948,7 @@ STATIC FUNCTION pkg_try_detection( hbmk, cName )
                   IF Empty( cIncludeDir )
                      cIncludeDir := "(system)"
                   ENDIF
-                  cDefine := "HBMK2_HAS_" + StrToDefine( cNameFlavour )
+                  cDefine := _HBMK_HAS_PREF + StrToDefine( cNameFlavour )
                   IF hbmk[ _HBMK_lInfo ]
                      hbmk_OutStd( hbmk, hb_StrFormat( I_( "Autodetected package '%1$s' (%2$s) at '%3$s', defining '%4$s'." ), cNameFlavour, cVersion, cIncludeDir, cDefine ) )
                   ENDIF