From 7fccc044ad49bb5d2a593dcc596c45050cd0c5f0 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Tue, 27 Nov 2012 16:14:13 +0000
Subject: [PATCH] 2012-11-27 17:08 UTC+0100 Viktor Szakats (harbour syenar.net)
   * contrib/*/*.hbp     % use ${hb_name}.hbx to avoid duplicating the project
       name inside the .hbp files

---
 harbour/ChangeLog.txt                 | 5 +++++
 harbour/contrib/gtwvg/gtwvg.hbp       | 2 +-
 harbour/contrib/hbamf/hbamf.hbp       | 2 +-
 harbour/contrib/hbblat/hbblat.hbp     | 2 +-
 harbour/contrib/hbblink/hbblink.hbp   | 2 +-
 harbour/contrib/hbbz2/hbbz2.hbp       | 2 +-
 harbour/contrib/hbcairo/hbcairo.hbp   | 2 +-
 harbour/contrib/hbcomm/hbcomm.hbp     | 2 +-
 harbour/contrib/hbct/hbct.hbp         | 2 +-
 harbour/contrib/hbcups/hbcups.hbp     | 2 +-
 harbour/contrib/hbexpat/hbexpat.hbp   | 2 +-
 harbour/contrib/hbfbird/hbfbird.hbp   | 2 +-
 harbour/contrib/hbfimage/hbfimage.hbp | 2 +-
 harbour/contrib/hbformat/hbformat.hbp | 2 +-
 harbour/contrib/hbfoxpro/hbfoxpro.hbp | 2 +-
 harbour/contrib/hbfship/hbfship.hbp   | 2 +-
 harbour/contrib/hbgd/hbgd.hbp         | 2 +-
 harbour/contrib/hbgs/hbgs.hbp         | 2 +-
 harbour/contrib/hbgt/hbgt.hbp         | 2 +-
 harbour/contrib/hbhpdf/hbhpdf.hbp     | 2 +-
 harbour/contrib/hbhttpd/hbhttpd.hbp   | 2 +-
 harbour/contrib/hblzf/hblzf.hbp       | 2 +-
 harbour/contrib/hbmagic/hbmagic.hbp   | 2 +-
 harbour/contrib/hbmemio/hbmemio.hbp   | 2 +-
 harbour/contrib/hbmisc/hbmisc.hbp     | 2 +-
 harbour/contrib/hbmlzo/hbmlzo.hbp     | 2 +-
 harbour/contrib/hbmxml/hbmxml.hbp     | 2 +-
 harbour/contrib/hbmysql/hbmysql.hbp   | 2 +-
 harbour/contrib/hbmzip/hbmzip.hbp     | 2 +-
 harbour/contrib/hbnetio/hbnetio.hbp   | 2 +-
 harbour/contrib/hbnf/hbnf.hbp         | 2 +-
 harbour/contrib/hbodbc/hbodbc.hbp     | 2 +-
 harbour/contrib/hboslib/hboslib.hbp   | 2 +-
 harbour/contrib/hbpgsql/hbpgsql.hbp   | 2 +-
 harbour/contrib/hbsms/hbsms.hbp       | 2 +-
 harbour/contrib/hbsqlit3/hbsqlit3.hbp | 2 +-
 harbour/contrib/hbtinymt/hbtinymt.hbp | 2 +-
 harbour/contrib/hbtip/hbtip.hbp       | 2 +-
 harbour/contrib/hbtpathy/hbtpathy.hbp | 2 +-
 harbour/contrib/hbunix/hbunix.hbp     | 2 +-
 harbour/contrib/hbwin/hbwin.hbp       | 2 +-
 harbour/contrib/hbxdiff/hbxdiff.hbp   | 2 +-
 harbour/contrib/hbxpp/hbxpp.hbp       | 2 +-
 harbour/contrib/hbzebra/hbzebra.hbp   | 2 +-
 harbour/contrib/hbziparc/hbziparc.hbp | 2 +-
 harbour/contrib/rddads/rddads.hbp     | 2 +-
 harbour/contrib/rddbm/rddbm.hbp       | 2 +-
 harbour/contrib/xhb/xhb.hbp           | 2 +-
 48 files changed, 52 insertions(+), 47 deletions(-)

diff --git a/harbour/ChangeLog.txt b/harbour/ChangeLog.txt
index 7e6dc09aea..0abc6020e5 100644
--- a/harbour/ChangeLog.txt
+++ b/harbour/ChangeLog.txt
@@ -10,6 +10,11 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2012-11-27 17:08 UTC+0100 Viktor Szakats (harbour syenar.net)
+  * contrib/*/*.hbp
+    % use ${hb_name}.hbx to avoid duplicating the project
+      name inside the .hbp files
+
 2012-11-27 16:57 UTC+0100 Viktor Szakats (harbour syenar.net)
   * package/winuni/RELNOTES.txt
     * msvc 2012 update 1
diff --git a/harbour/contrib/gtwvg/gtwvg.hbp b/harbour/contrib/gtwvg/gtwvg.hbp
index f4c3c86624..1ddf71201a 100644
--- a/harbour/contrib/gtwvg/gtwvg.hbp
+++ b/harbour/contrib/gtwvg/gtwvg.hbp
@@ -26,7 +26,7 @@ wvgutils.c
 wvgwin.c
 wvgwing.c
 
-gtwvg.hbx
+${hb_name}.hbx
 
 3state.prg
 activex.prg
diff --git a/harbour/contrib/hbamf/hbamf.hbp b/harbour/contrib/hbamf/hbamf.hbp
index ceb2d975be..3a3953e765 100644
--- a/harbour/contrib/hbamf/hbamf.hbp
+++ b/harbour/contrib/hbamf/hbamf.hbp
@@ -9,7 +9,7 @@
 
 -w3 -es2
 
-hbamf.hbx
+${hb_name}.hbx
 
 amfenc.c
 amfdec.c
diff --git a/harbour/contrib/hbblat/hbblat.hbp b/harbour/contrib/hbblat/hbblat.hbp
index a0fed9a563..8f3cc9ce38 100644
--- a/harbour/contrib/hbblat/hbblat.hbp
+++ b/harbour/contrib/hbblat/hbblat.hbp
@@ -18,7 +18,7 @@
 
 -iflag={bcc}-a
 
-hbblat.hbx
+${hb_name}.hbx
 
 blatwrp.c
 blatcls.prg
diff --git a/harbour/contrib/hbblink/hbblink.hbp b/harbour/contrib/hbblink/hbblink.hbp
index ce720ac193..1ae0a5e06d 100644
--- a/harbour/contrib/hbblink/hbblink.hbp
+++ b/harbour/contrib/hbblink/hbblink.hbp
@@ -9,6 +9,6 @@
 
 -w3 -es2
 
-hbblink.hbx
+${hb_name}.hbx
 
 blinker.prg
diff --git a/harbour/contrib/hbbz2/hbbz2.hbp b/harbour/contrib/hbbz2/hbbz2.hbp
index b74d91f1c8..a60e1a263d 100644
--- a/harbour/contrib/hbbz2/hbbz2.hbp
+++ b/harbour/contrib/hbbz2/hbbz2.hbp
@@ -18,7 +18,7 @@
 -depincpathlocal=bzip2:3rd/bz2
 -depfinish=bzip2
 
-hbbz2.hbx
+${hb_name}.hbx
 
 core.c
 
diff --git a/harbour/contrib/hbcairo/hbcairo.hbp b/harbour/contrib/hbcairo/hbcairo.hbp
index 03fe1763da..e2fccb25e0 100644
--- a/harbour/contrib/hbcairo/hbcairo.hbp
+++ b/harbour/contrib/hbcairo/hbcairo.hbp
@@ -20,7 +20,7 @@
 
 -iflag={bcc}-a
 
-hbcairo.hbx
+${hb_name}.hbx
 
 context.c
 core.c
diff --git a/harbour/contrib/hbcomm/hbcomm.hbp b/harbour/contrib/hbcomm/hbcomm.hbp
index 9c7abc9a96..de7b4a3d1a 100644
--- a/harbour/contrib/hbcomm/hbcomm.hbp
+++ b/harbour/contrib/hbcomm/hbcomm.hbp
@@ -9,6 +9,6 @@
 
 -w3 -es2
 
-hbcomm.hbx
+${hb_name}.hbx
 
 comm.prg
diff --git a/harbour/contrib/hbct/hbct.hbp b/harbour/contrib/hbct/hbct.hbp
index 1c0947b6c7..f959626738 100644
--- a/harbour/contrib/hbct/hbct.hbp
+++ b/harbour/contrib/hbct/hbct.hbp
@@ -19,7 +19,7 @@
 -instfile=contrib:ctstrfil.h
 -instfile=contrib:ctwin.h
 
-hbct.hbx
+${hb_name}.hbx
 
 addascii.c
 asciisum.c
diff --git a/harbour/contrib/hbcups/hbcups.hbp b/harbour/contrib/hbcups/hbcups.hbp
index 930c7a46ae..1318a1c4aa 100644
--- a/harbour/contrib/hbcups/hbcups.hbp
+++ b/harbour/contrib/hbcups/hbcups.hbp
@@ -16,6 +16,6 @@
 -depcontrol=cups:${HB_WITH_CUPS}
 -depincpath=cups:/usr/include
 
-hbcups.hbx
+${hb_name}.hbx
 
 core.c
diff --git a/harbour/contrib/hbexpat/hbexpat.hbp b/harbour/contrib/hbexpat/hbexpat.hbp
index b34e5e5ea8..50ee90cb22 100644
--- a/harbour/contrib/hbexpat/hbexpat.hbp
+++ b/harbour/contrib/hbexpat/hbexpat.hbp
@@ -18,7 +18,7 @@
 
 -cflag=-DXML_STATIC
 
-hbexpat.hbx
+${hb_name}.hbx
 
 core.c
 internal.c
diff --git a/harbour/contrib/hbfbird/hbfbird.hbp b/harbour/contrib/hbfbird/hbfbird.hbp
index 49022c058b..6d969fda15 100644
--- a/harbour/contrib/hbfbird/hbfbird.hbp
+++ b/harbour/contrib/hbfbird/hbfbird.hbp
@@ -24,7 +24,7 @@
 # For FireBird headers
 -c=gnu90
 
-hbfbird.hbx
+${hb_name}.hbx
 
 firebird.c
 tfirebrd.prg
diff --git a/harbour/contrib/hbfimage/hbfimage.hbp b/harbour/contrib/hbfimage/hbfimage.hbp
index 4ac9405973..768ed6ea97 100644
--- a/harbour/contrib/hbfimage/hbfimage.hbp
+++ b/harbour/contrib/hbfimage/hbfimage.hbp
@@ -22,6 +22,6 @@
 # For FreeImage headers
 -c=gnu90
 
-hbfimage.hbx
+${hb_name}.hbx
 
 fi_wrp.c
diff --git a/harbour/contrib/hbformat/hbformat.hbp b/harbour/contrib/hbformat/hbformat.hbp
index 3850be3b63..5982d37304 100644
--- a/harbour/contrib/hbformat/hbformat.hbp
+++ b/harbour/contrib/hbformat/hbformat.hbp
@@ -9,7 +9,7 @@
 
 -w3 -es2
 
-hbformat.hbx
+${hb_name}.hbx
 
 hbfmtcls.prg
 hbfuncs.prg
diff --git a/harbour/contrib/hbfoxpro/hbfoxpro.hbp b/harbour/contrib/hbfoxpro/hbfoxpro.hbp
index 82244e7c68..17af5dacb3 100644
--- a/harbour/contrib/hbfoxpro/hbfoxpro.hbp
+++ b/harbour/contrib/hbfoxpro/hbfoxpro.hbp
@@ -9,7 +9,7 @@
 
 -w3 -es2
 
-hbfoxpro.hbx
+${hb_name}.hbx
 
 dll.prg
 misc.prg
diff --git a/harbour/contrib/hbfship/hbfship.hbp b/harbour/contrib/hbfship/hbfship.hbp
index 46853f3d76..974c8c6dc3 100644
--- a/harbour/contrib/hbfship/hbfship.hbp
+++ b/harbour/contrib/hbfship/hbfship.hbp
@@ -9,7 +9,7 @@
 
 -w3 -es2
 
-hbfship.hbx
+${hb_name}.hbx
 
 fldarr.prg
 isdb.prg
diff --git a/harbour/contrib/hbgd/hbgd.hbp b/harbour/contrib/hbgd/hbgd.hbp
index 870fab92d2..9a9d3d9fd1 100644
--- a/harbour/contrib/hbgd/hbgd.hbp
+++ b/harbour/contrib/hbgd/hbgd.hbp
@@ -21,7 +21,7 @@ hbct.hbc
 -depimplibs=gd:../bin/bgd.dll{!(msvc|pocc|mingw)|hbdyn}
 -depimplibs=gd:../lib/bgd.lib{(msvc|pocc|mingw)&!hbdyn}
 
-hbgd.hbx
+${hb_name}.hbx
 
 gdwrp.c
 
diff --git a/harbour/contrib/hbgs/hbgs.hbp b/harbour/contrib/hbgs/hbgs.hbp
index c2201461c1..813846e0e9 100644
--- a/harbour/contrib/hbgs/hbgs.hbp
+++ b/harbour/contrib/hbgs/hbgs.hbp
@@ -21,6 +21,6 @@
 -depimplibs=gs:${HB_WITH_GS_BIN}/gsdll2.dll{os2}
 -depimplibd=gs:gs
 
-hbgs.hbx
+${hb_name}.hbx
 
 core.c
diff --git a/harbour/contrib/hbgt/hbgt.hbp b/harbour/contrib/hbgt/hbgt.hbp
index 27b564fe40..7cb93e1a24 100644
--- a/harbour/contrib/hbgt/hbgt.hbp
+++ b/harbour/contrib/hbgt/hbgt.hbp
@@ -9,7 +9,7 @@
 
 -w3 -es2
 
-hbgt.hbx
+${hb_name}.hbx
 
 asciisgt.c
 ascposgt.c
diff --git a/harbour/contrib/hbhpdf/hbhpdf.hbp b/harbour/contrib/hbhpdf/hbhpdf.hbp
index baef21c4d5..77d3ab81cb 100644
--- a/harbour/contrib/hbhpdf/hbhpdf.hbp
+++ b/harbour/contrib/hbhpdf/hbhpdf.hbp
@@ -19,7 +19,7 @@
 -depimplibs=libharu:../lib_dll/libhpdf.dll
 -depfinish=libharu
 
-hbhpdf.hbx
+${hb_name}.hbx
 
 core.c
 annot.c
diff --git a/harbour/contrib/hbhttpd/hbhttpd.hbp b/harbour/contrib/hbhttpd/hbhttpd.hbp
index 66eb114921..fe23f37b27 100644
--- a/harbour/contrib/hbhttpd/hbhttpd.hbp
+++ b/harbour/contrib/hbhttpd/hbhttpd.hbp
@@ -9,7 +9,7 @@
 
 -w3 -es2
 
-hbhttpd.hbx
+${hb_name}.hbx
 
 core.prg
 widgets.prg
diff --git a/harbour/contrib/hblzf/hblzf.hbp b/harbour/contrib/hblzf/hblzf.hbp
index 37cebf975d..94440a12c6 100644
--- a/harbour/contrib/hblzf/hblzf.hbp
+++ b/harbour/contrib/hblzf/hblzf.hbp
@@ -16,7 +16,7 @@
 -depincpathlocal=lzf:3rd/liblzf
 -depfinish=lzf
 
-hblzf.hbx
+${hb_name}.hbx
 
 core.c
 
diff --git a/harbour/contrib/hbmagic/hbmagic.hbp b/harbour/contrib/hbmagic/hbmagic.hbp
index f95a1d2621..608732107e 100644
--- a/harbour/contrib/hbmagic/hbmagic.hbp
+++ b/harbour/contrib/hbmagic/hbmagic.hbp
@@ -15,7 +15,7 @@
 -depincpath=libmagic:/usr/include
 -depincpath=libmagic:/opt/local/include
 
-hbmagic.hbx
+${hb_name}.hbx
 
 core.c
 hbmagis.prg
diff --git a/harbour/contrib/hbmemio/hbmemio.hbp b/harbour/contrib/hbmemio/hbmemio.hbp
index 5f711cc31a..3eb8b4d4dd 100644
--- a/harbour/contrib/hbmemio/hbmemio.hbp
+++ b/harbour/contrib/hbmemio/hbmemio.hbp
@@ -9,6 +9,6 @@
 
 -w3 -es2
 
-hbmemio.hbx
+${hb_name}.hbx
 
 memio.c
diff --git a/harbour/contrib/hbmisc/hbmisc.hbp b/harbour/contrib/hbmisc/hbmisc.hbp
index ce74bbe79d..1797926058 100644
--- a/harbour/contrib/hbmisc/hbmisc.hbp
+++ b/harbour/contrib/hbmisc/hbmisc.hbp
@@ -9,7 +9,7 @@
 
 -w3 -es2
 
-hbmisc.hbx
+${hb_name}.hbx
 
 bbabble.c
 dates.c
diff --git a/harbour/contrib/hbmlzo/hbmlzo.hbp b/harbour/contrib/hbmlzo/hbmlzo.hbp
index 45f2f14847..902c602477 100644
--- a/harbour/contrib/hbmlzo/hbmlzo.hbp
+++ b/harbour/contrib/hbmlzo/hbmlzo.hbp
@@ -16,7 +16,7 @@
 -depincpathlocal=minilzo:3rd/minilzo
 -depfinish=minilzo
 
-hbmlzo.hbx
+${hb_name}.hbx
 
 core.c
 
diff --git a/harbour/contrib/hbmxml/hbmxml.hbp b/harbour/contrib/hbmxml/hbmxml.hbp
index 968a0ed13c..c6e5341ef4 100644
--- a/harbour/contrib/hbmxml/hbmxml.hbp
+++ b/harbour/contrib/hbmxml/hbmxml.hbp
@@ -16,7 +16,7 @@
 -depincpathlocal=mxml:3rd/minixml
 -depfinish=mxml
 
-hbmxml.hbx
+${hb_name}.hbx
 
 core.c
 format.prg
diff --git a/harbour/contrib/hbmysql/hbmysql.hbp b/harbour/contrib/hbmysql/hbmysql.hbp
index e0c5587e47..d472833272 100644
--- a/harbour/contrib/hbmysql/hbmysql.hbp
+++ b/harbour/contrib/hbmysql/hbmysql.hbp
@@ -18,7 +18,7 @@
 -depimplibs=mysql:../lib/opt/libmySQL.dll
 -depimplibs=mysql:../lib/libmySQL.dll
 
-hbmysql.hbx
+${hb_name}.hbx
 
 mysql.c
 
diff --git a/harbour/contrib/hbmzip/hbmzip.hbp b/harbour/contrib/hbmzip/hbmzip.hbp
index 5d2248af27..d27d6c8fc5 100644
--- a/harbour/contrib/hbmzip/hbmzip.hbp
+++ b/harbour/contrib/hbmzip/hbmzip.hbp
@@ -31,7 +31,7 @@
 -depincpath=zlib:/boot/develop/headers/3rdparty
 -depincpathlocal=zlib:../../src/3rd/zlib
 
-hbmzip.hbx
+${hb_name}.hbx
 
 mzip.c
 mziperr.prg
diff --git a/harbour/contrib/hbnetio/hbnetio.hbp b/harbour/contrib/hbnetio/hbnetio.hbp
index c18fc78415..b18acaa94c 100644
--- a/harbour/contrib/hbnetio/hbnetio.hbp
+++ b/harbour/contrib/hbnetio/hbnetio.hbp
@@ -9,7 +9,7 @@
 
 -w3 -es2
 
-hbnetio.hbx
+${hb_name}.hbx
 
 netiosrv.c
 netiocli.c
diff --git a/harbour/contrib/hbnf/hbnf.hbp b/harbour/contrib/hbnf/hbnf.hbp
index f2b99b076b..ddc9eb4520 100644
--- a/harbour/contrib/hbnf/hbnf.hbp
+++ b/harbour/contrib/hbnf/hbnf.hbp
@@ -9,7 +9,7 @@
 
 -w3 -es2
 
-hbnf.hbx
+${hb_name}.hbx
 
 alt.c
 caplock.c
diff --git a/harbour/contrib/hbodbc/hbodbc.hbp b/harbour/contrib/hbodbc/hbodbc.hbp
index 11d6281f7f..4897fb9021 100644
--- a/harbour/contrib/hbodbc/hbodbc.hbp
+++ b/harbour/contrib/hbodbc/hbodbc.hbp
@@ -19,7 +19,7 @@
 -depincpath=odbc:/usr/include
 -depincpath=odbc:/usr/local/include
 
-hbodbc.hbx
+${hb_name}.hbx
 
 odbc.c
 
diff --git a/harbour/contrib/hboslib/hboslib.hbp b/harbour/contrib/hboslib/hboslib.hbp
index 397e066183..b5fb6fe252 100644
--- a/harbour/contrib/hboslib/hboslib.hbp
+++ b/harbour/contrib/hboslib/hboslib.hbp
@@ -9,6 +9,6 @@
 
 -w3 -es2
 
-hboslib.hbx
+${hb_name}.hbx
 
 core.prg
diff --git a/harbour/contrib/hbpgsql/hbpgsql.hbp b/harbour/contrib/hbpgsql/hbpgsql.hbp
index c090b42c76..faceb93c53 100644
--- a/harbour/contrib/hbpgsql/hbpgsql.hbp
+++ b/harbour/contrib/hbpgsql/hbpgsql.hbp
@@ -24,7 +24,7 @@
 
 -iflag={bcc}-a
 
-hbpgsql.hbx
+${hb_name}.hbx
 
 postgres.c
 rddcopy.c
diff --git a/harbour/contrib/hbsms/hbsms.hbp b/harbour/contrib/hbsms/hbsms.hbp
index 4b0d37977d..030668bb86 100644
--- a/harbour/contrib/hbsms/hbsms.hbp
+++ b/harbour/contrib/hbsms/hbsms.hbp
@@ -9,6 +9,6 @@
 
 -w3 -es2
 
-hbsms.hbx
+${hb_name}.hbx
 
 sms.prg
diff --git a/harbour/contrib/hbsqlit3/hbsqlit3.hbp b/harbour/contrib/hbsqlit3/hbsqlit3.hbp
index e5f01d439d..3148bc88d6 100644
--- a/harbour/contrib/hbsqlit3/hbsqlit3.hbp
+++ b/harbour/contrib/hbsqlit3/hbsqlit3.hbp
@@ -17,7 +17,7 @@
 -depincpathlocal=sqlite3:../3rd/sqlite3
 -depfinish=sqlite3
 
-hbsqlit3.hbx
+${hb_name}.hbx
 
 core.c
 hdbcsqlt.prg
diff --git a/harbour/contrib/hbtinymt/hbtinymt.hbp b/harbour/contrib/hbtinymt/hbtinymt.hbp
index 6a34088cf7..c817256fd1 100644
--- a/harbour/contrib/hbtinymt/hbtinymt.hbp
+++ b/harbour/contrib/hbtinymt/hbtinymt.hbp
@@ -18,7 +18,7 @@
 -depincpathlocal=tinymt:3rd/tinymt
 -depfinish=tinymt
 
-hbtinymt.hbx
+${hb_name}.hbx
 
 core32.c
 core64.c
diff --git a/harbour/contrib/hbtip/hbtip.hbp b/harbour/contrib/hbtip/hbtip.hbp
index 469dfa0ff5..b518ed4cd8 100644
--- a/harbour/contrib/hbtip/hbtip.hbp
+++ b/harbour/contrib/hbtip/hbtip.hbp
@@ -10,7 +10,7 @@
 
 -w3 -es2
 
-hbtip.hbx
+${hb_name}.hbx
 
 encurlc.c
 utils.c
diff --git a/harbour/contrib/hbtpathy/hbtpathy.hbp b/harbour/contrib/hbtpathy/hbtpathy.hbp
index d8df8ad6d6..4b0c545a38 100644
--- a/harbour/contrib/hbtpathy/hbtpathy.hbp
+++ b/harbour/contrib/hbtpathy/hbtpathy.hbp
@@ -9,7 +9,7 @@
 
 -w3 -es2
 
-hbtpathy.hbx
+${hb_name}.hbx
 
 telepath.prg
 tp_idle.prg
diff --git a/harbour/contrib/hbunix/hbunix.hbp b/harbour/contrib/hbunix/hbunix.hbp
index a167997020..e5093f8c9a 100644
--- a/harbour/contrib/hbunix/hbunix.hbp
+++ b/harbour/contrib/hbunix/hbunix.hbp
@@ -13,7 +13,7 @@
 
 -c=gnu90
 
-hbunix.hbx
+${hb_name}.hbx
 
 chdir.c
 chroot.c
diff --git a/harbour/contrib/hbwin/hbwin.hbp b/harbour/contrib/hbwin/hbwin.hbp
index d2515bd376..ed10aa3132 100644
--- a/harbour/contrib/hbwin/hbwin.hbp
+++ b/harbour/contrib/hbwin/hbwin.hbp
@@ -26,7 +26,7 @@
 -instfile=contrib:hbwinole.h
 -instfile=contrib:*.def
 
-hbwin.hbx
+${hb_name}.hbx
 
 axcore.c
 mapi.c
diff --git a/harbour/contrib/hbxdiff/hbxdiff.hbp b/harbour/contrib/hbxdiff/hbxdiff.hbp
index 8c59a5e82a..849e3dd2bd 100644
--- a/harbour/contrib/hbxdiff/hbxdiff.hbp
+++ b/harbour/contrib/hbxdiff/hbxdiff.hbp
@@ -16,7 +16,7 @@
 -depincpathlocal=xdiff:3rd/libxdiff
 -depfinish=xdiff
 
-hbxdiff.hbx
+${hb_name}.hbx
 
 core.c
 
diff --git a/harbour/contrib/hbxpp/hbxpp.hbp b/harbour/contrib/hbxpp/hbxpp.hbp
index 1bf2990ffa..79d5b721b2 100644
--- a/harbour/contrib/hbxpp/hbxpp.hbp
+++ b/harbour/contrib/hbxpp/hbxpp.hbp
@@ -9,7 +9,7 @@
 
 -w3 -es2
 
-hbxpp.hbx
+${hb_name}.hbx
 
 binnumx.c
 dbcmdx.c
diff --git a/harbour/contrib/hbzebra/hbzebra.hbp b/harbour/contrib/hbzebra/hbzebra.hbp
index 4805251db4..b74d8e1cb2 100644
--- a/harbour/contrib/hbzebra/hbzebra.hbp
+++ b/harbour/contrib/hbzebra/hbzebra.hbp
@@ -9,7 +9,7 @@
 
 -w3 -es2
 
-hbzebra.hbx
+${hb_name}.hbx
 
 # Core
 core.c
diff --git a/harbour/contrib/hbziparc/hbziparc.hbp b/harbour/contrib/hbziparc/hbziparc.hbp
index 4c6a18da38..4bc790b3e9 100644
--- a/harbour/contrib/hbziparc/hbziparc.hbp
+++ b/harbour/contrib/hbziparc/hbziparc.hbp
@@ -9,7 +9,7 @@
 
 -w3 -es2
 
-hbziparc.hbx
+${hb_name}.hbx
 
 ziparc.prg
 
diff --git a/harbour/contrib/rddads/rddads.hbp b/harbour/contrib/rddads/rddads.hbp
index b07494520e..c6b8cdb23a 100644
--- a/harbour/contrib/rddads/rddads.hbp
+++ b/harbour/contrib/rddads/rddads.hbp
@@ -26,7 +26,7 @@
 # for ADS headers
 -c=gnu90
 
-rddads.hbx
+${hb_name}.hbx
 
 ads1.c
 adsfunc.c
diff --git a/harbour/contrib/rddbm/rddbm.hbp b/harbour/contrib/rddbm/rddbm.hbp
index 03513d58a2..9ec2d24d87 100644
--- a/harbour/contrib/rddbm/rddbm.hbp
+++ b/harbour/contrib/rddbm/rddbm.hbp
@@ -9,7 +9,7 @@
 
 -w3 -es2
 
-rddbm.hbx
+${hb_name}.hbx
 
 bmdbfx.c
 bmdbfcdx.prg
diff --git a/harbour/contrib/xhb/xhb.hbp b/harbour/contrib/xhb/xhb.hbp
index b52d1b2605..110c509a60 100644
--- a/harbour/contrib/xhb/xhb.hbp
+++ b/harbour/contrib/xhb/xhb.hbp
@@ -24,7 +24,7 @@ hbwin.hbc
 hbfship.hbc
 hbxpp.hbc
 
-xhb.hbx
+${hb_name}.hbx
 
 bkgtsks.c
 cstructc.c