From 032297d7e60972cd7532221158525fcb003319ae Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Tue, 8 May 2012 15:56:12 +0000
Subject: [PATCH] 2012-05-08 17:55 UTC+0200 Viktor Szakats (harbour syenar.net)
   * contrib/hbpost.hbm   - contrib/hbqt/hbmk2_qt.hbs   +
 contrib/hbqt/hbmk2_qt.hb   * contrib/hbqt/hbqt_common.hbc   *
 contrib/hbqt/hbqt_common.hbm     * .hbs -> .hb for Harbour scripts in
 contribs

---
 harbour/ChangeLog                                  | 8 ++++++++
 harbour/contrib/hbpost.hbm                         | 3 +--
 harbour/contrib/hbqt/{hbmk2_qt.hbs => hbmk2_qt.hb} | 0
 harbour/contrib/hbqt/hbqt_common.hbc               | 2 +-
 harbour/contrib/hbqt/hbqt_common.hbm               | 5 ++---
 5 files changed, 12 insertions(+), 6 deletions(-)
 rename harbour/contrib/hbqt/{hbmk2_qt.hbs => hbmk2_qt.hb} (100%)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index a628217f91..72958c972e 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,14 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-05-08 17:55 UTC+0200 Viktor Szakats (harbour syenar.net)
+  * contrib/hbpost.hbm
+  - contrib/hbqt/hbmk2_qt.hbs
+  + contrib/hbqt/hbmk2_qt.hb
+  * contrib/hbqt/hbqt_common.hbc
+  * contrib/hbqt/hbqt_common.hbm
+    * .hbs -> .hb for Harbour scripts in contribs
+
 2012-05-08 17:51 UTC+0200 Viktor Szakats (harbour syenar.net)
   * config/postinst.hbs
     * implemented same ASORT() fix as in prev commit by Przemek.
diff --git a/harbour/contrib/hbpost.hbm b/harbour/contrib/hbpost.hbm
index 2c780d9f75..e39890eede 100644
--- a/harbour/contrib/hbpost.hbm
+++ b/harbour/contrib/hbpost.hbm
@@ -79,9 +79,8 @@
 {hbdyn&(cygwin|!unix)}-workdir=../bin/${hb_plat}/${hb_comp}${hb_build}/${hb_work}/${hb_outputname}${hb_workdynsub}
 
 # copy contrib-specific public files
--instfile=contrib:${_HB_CONTRIB_SUBDIR}/*.hbc
 -instfile=contrib:${_HB_CONTRIB_SUBDIR}/*.hb
--instfile=contrib:${_HB_CONTRIB_SUBDIR}/*.hbs
+-instfile=contrib:${_HB_CONTRIB_SUBDIR}/*.hbc
 -instfile=contrib:${_HB_CONTRIB_SUBDIR}/*.hbx
 -instfile=contrib:${_HB_CONTRIB_SUBDIR}/*.ch
 -instfile=contrib:${_HB_CONTRIB_SUBDIR}/*.txt
diff --git a/harbour/contrib/hbqt/hbmk2_qt.hbs b/harbour/contrib/hbqt/hbmk2_qt.hb
similarity index 100%
rename from harbour/contrib/hbqt/hbmk2_qt.hbs
rename to harbour/contrib/hbqt/hbmk2_qt.hb
diff --git a/harbour/contrib/hbqt/hbqt_common.hbc b/harbour/contrib/hbqt/hbqt_common.hbc
index b2e97bfc22..b32ad1e4c6 100644
--- a/harbour/contrib/hbqt/hbqt_common.hbc
+++ b/harbour/contrib/hbqt/hbqt_common.hbc
@@ -12,7 +12,7 @@ stop={HB_WITH_QT='no'}QT deselected, build skipped.
 
 incpaths=.
 
-plugins=hbmk2_qt.hbs
+plugins=hbmk2_qt.hb
 
 {msvc}ldflags=-nodefaultlib:msvcrt.lib -defaultlib:libcmt.lib
 {beos}ldflags=-L/boot/common/lib
diff --git a/harbour/contrib/hbqt/hbqt_common.hbm b/harbour/contrib/hbqt/hbqt_common.hbm
index f373e9d02c..1fdbb53cfe 100644
--- a/harbour/contrib/hbqt/hbqt_common.hbm
+++ b/harbour/contrib/hbqt/hbqt_common.hbm
@@ -21,7 +21,7 @@
 
 -stop{dos|watcom|bcc|pocc|pocc64|poccarm|msvcia64|pcc}
 
--plugin=hbmk2_qt.hbs
+-plugin=hbmk2_qt.hb
 
 -deppkgname=qt:QtCore
 -depkeyhead=qt:QtCore/qglobal.h
@@ -35,9 +35,8 @@
 {darwin}-depincpath=qt:/Library/Frameworks
 {beos}-depincpath=qt:/boot/common/include
 
--instfile=contrib_qt:*.hbc
 -instfile=contrib_qt:*.hb
--instfile=contrib_qt:*.hbs
+-instfile=contrib_qt:*.hbc
 -instfile=contrib_qt:*.txt
 -instfile=contrib_qt_tests:tests/*.*