From 2f04f390aa4440e8bc9e08bee70a662d8ebd4afc Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Sun, 4 Mar 2012 20:05:31 +0000
Subject: [PATCH] 2012-03-04 21:00 UTC+0100 Viktor Szakats (harbour syenar.net)
   * contrib/hbct/hbct.hbp   * contrib/hbwin/hbwin.hbp   * contrib/xhb/xhb.hbp
     + install .h headers to contrib dir only (and not anymore to       the
 central Harbour include dir). This means that 3rd party       or user code
 that uses these C-level contrib headers will now have       to add contrib
 package using <contrib>.hbc hbmk2 option instead       of manual -l options.
 INCOMPATIBLE.

---
 harbour/ChangeLog               | 10 ++++++++++
 harbour/contrib/hbct/hbct.hbp   | 12 ++++++------
 harbour/contrib/hbwin/hbwin.hbp |  6 +++---
 harbour/contrib/xhb/xhb.hbp     |  4 ++--
 4 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 892111a263..d38d7e8d85 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,16 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-03-04 21:00 UTC+0100 Viktor Szakats (harbour syenar.net)
+  * contrib/hbct/hbct.hbp
+  * contrib/hbwin/hbwin.hbp
+  * contrib/xhb/xhb.hbp
+    + install .h headers to contrib dir only (and not anymore to
+      the central Harbour include dir). This means that 3rd party
+      or user code that uses these C-level contrib headers will now have
+      to add contrib package using <contrib>.hbc hbmk2 option instead
+      of manual -l options. INCOMPATIBLE.
+
 2012-03-04 20:31 UTC+0100 Viktor Szakats (harbour syenar.net)
   * contrib/hbpost.hbm
     + install .hbx files to respective contrib dirs.
diff --git a/harbour/contrib/hbct/hbct.hbp b/harbour/contrib/hbct/hbct.hbp
index 2232b48763..50b47ebaa1 100644
--- a/harbour/contrib/hbct/hbct.hbp
+++ b/harbour/contrib/hbct/hbct.hbp
@@ -12,12 +12,12 @@
 # For stime()
 -c=gnu90{linux}
 
--instfile=inc:ct.h
--instfile=inc:ctmath.h
--instfile=inc:ctset.h
--instfile=inc:ctstr.h
--instfile=inc:ctstrfil.h
--instfile=inc:ctwin.h
+-instfile=contrib:ct.h
+-instfile=contrib:ctmath.h
+-instfile=contrib:ctset.h
+-instfile=contrib:ctstr.h
+-instfile=contrib:ctstrfil.h
+-instfile=contrib:ctwin.h
 -instfile=inc:ct.ch
 -instfile=inc:ctcom.ch
 -instfile=inc:ctdisk.ch
diff --git a/harbour/contrib/hbwin/hbwin.hbp b/harbour/contrib/hbwin/hbwin.hbp
index 2fe33b873b..eedfdd4c05 100644
--- a/harbour/contrib/hbwin/hbwin.hbp
+++ b/harbour/contrib/hbwin/hbwin.hbp
@@ -20,9 +20,9 @@
 -depincpath=png:/opt/local/include
 -depincpathlocal=png:../../src/3rd/png
 
--instfile=inc:hbwapi.h
--instfile=inc:hbwin.h
--instfile=inc:hbwinole.h
+-instfile=contrib:hbwapi.h
+-instfile=contrib:hbwin.h
+-instfile=contrib:hbwinole.h
 -instfile=inc:hbwin.ch
 -instfile=inc:hbwin.hbx
 -instfile=contrib:*.def
diff --git a/harbour/contrib/xhb/xhb.hbp b/harbour/contrib/xhb/xhb.hbp
index 247063bb59..b8760a4d65 100644
--- a/harbour/contrib/xhb/xhb.hbp
+++ b/harbour/contrib/xhb/xhb.hbp
@@ -12,8 +12,8 @@
 
 -w3 -es2
 
--instfile=inc:hbcompat.h
--instfile=inc:xhb.h
+-instfile=contrib:hbcompat.h
+-instfile=contrib:xhb.h
 -instfile=inc:hbcompat.ch
 -instfile=inc:xhb.ch
 -instfile=inc:xhbcls.ch