From 1979515ea08253ad275ce38e629ad720c3257c19 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Fri, 9 Jul 2010 20:58:46 +0000
Subject: [PATCH] 2010-07-09 22:57 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * contrib/make.hbs   * contrib/hbpre.hbm     ! Fixed -build
 option to be always passed on the cmdline.     % Cleaned 'hbmk2 --hbinfo'
 cmdline.

---
 harbour/ChangeLog         | 6 ++++++
 harbour/contrib/hbpre.hbm | 1 -
 harbour/contrib/make.hbs  | 6 +++++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index de2fbfbf49..e3b79f1d9a 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,12 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-07-09 22:57 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/make.hbs
+  * contrib/hbpre.hbm
+    ! Fixed -build option to be always passed on the cmdline.
+    % Cleaned 'hbmk2 --hbinfo' cmdline.
+
 2010-07-09 22:49 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * utils/hbmk2/hbmk2.prg
     + --hbrefs option renamed to --hbinfo and now also includes
diff --git a/harbour/contrib/hbpre.hbm b/harbour/contrib/hbpre.hbm
index aa5e8f63ae..401ce63866 100644
--- a/harbour/contrib/hbpre.hbm
+++ b/harbour/contrib/hbpre.hbm
@@ -9,7 +9,6 @@
 {_HB_BUILD_MIGR}-trace
 
 {!HB_BUILD_DEBUG}-l
-{HB_BUILD_NAME}-build=${HB_BUILD_NAME}
 
 {HB_BUILD_MODE='cpp'}-cpp=yes
 {HB_BUILD_MODE='c'}-cpp=no
diff --git a/harbour/contrib/make.hbs b/harbour/contrib/make.hbs
index 3e6d134889..ca621c735e 100755
--- a/harbour/contrib/make.hbs
+++ b/harbour/contrib/make.hbs
@@ -549,7 +549,7 @@ STATIC FUNCTION call_hbmk2_dept( cBinDir, cProject, /* @ */ cType )
    LOCAL tmp, tmp1
    LOCAL aList := {}
 
-   hb_processRun( PathSepToSelf( cBinDir ) + "hbmk2" + " -quiet -lang=en -width=0 -q0 --hbinfo " + cProject,, @tmp  )
+   hb_processRun( PathSepToSelf( cBinDir ) + "hbmk2 --hbinfo " + cProject,, @tmp  )
 
    IF ( tmp1 := At( "targettype{{", tmp ) ) > 0
       tmp := SubStr( tmp, tmp1 + Len( "targettype{{" ) )
@@ -576,6 +576,10 @@ STATIC FUNCTION call_hbmk2_dept( cBinDir, cProject, /* @ */ cType )
 STATIC FUNCTION call_hbmk2( cBinDir, cProject, cOptionsPre, cOptionsPost )
    LOCAL nErrorLevel
 
+   IF ! Empty( GetEnv( "HB_BUILD_NAME" ) )
+      cOptionsPre += " -build=" + GetEnv( "HB_BUILD_NAME" )
+   ENDIF
+
    nErrorLevel := mk_hb_processRun( PathSepToSelf( cBinDir ) + "hbmk2" +;
                                     " -lang=en -width=0 @" + s_cHome + "hbpre" + cOptionsPre +;
                                     " " + cProject +;