From 907bd2c8e0c9552f94a09480623784fb4ca3420f Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Wed, 26 Aug 2009 06:31:55 +0000
Subject: [PATCH] 2009-08-26 08:30 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * ChangeLog   * config/global.mk     ! Added 'SHELL := /bin/sh'
 lines after 'sh' HB_SHELL detection.       Under certain circumstances SHELL
 will point to COMSPEC even       when launched from bash shell (f.e. DJGPP
 GNU Make launched       from DJGPP sh.exe running on Windows OS or using MSYS
 sh.exe).       This seems to be a safe and often used solution on all
 platforms       according to GNU Make docs '5.3.1 Choosing the Shell'
 section:          http://www.gnu.org/software/make/manual/make.html       Fix
 me if you find this wrong.

  * ChangeLog
    ! Stripped non-ASCII (accented) chars in recent entries.
      See: 2008-11-09 12:26 UTC+0100 Viktor Szakats
---
 harbour/ChangeLog        | 22 +++++++++++++++++++---
 harbour/config/global.mk |  2 ++
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 8cb859cf8d..172b3c27ac 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,22 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-08-26 08:30 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * ChangeLog
+  * config/global.mk
+    ! Added 'SHELL := /bin/sh' lines after 'sh' HB_SHELL detection.
+      Under certain circumstances SHELL will point to COMSPEC even
+      when launched from bash shell (f.e. DJGPP GNU Make launched
+      from DJGPP sh.exe running on Windows OS or using MSYS sh.exe).
+      This seems to be a safe and often used solution on all platforms
+      according to GNU Make docs '5.3.1 Choosing the Shell' section:
+         http://www.gnu.org/software/make/manual/make.html
+      Fix me if you find this wrong.
+
+  * ChangeLog
+    ! Stripped non-ASCII (accented) chars in recent entries.
+      See: 2008-11-09 12:26 UTC+0100 Viktor Szakats
+
 2009-08-26 02:34 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/include/hbapifs.h
   * harbour/source/rtl/filebuf.c
@@ -36,16 +52,16 @@
 2009-08-25 15:48 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
   * contrib/hbxbp/xbpfontdialog.prg
     ! Fixed warning about oFont:setPointSize() which cannot be less than 0.
-      Discovered by István Bisz.
+      Discovered by Istvan Bisz.
 
 2009-08-25 14:37 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
   * contrib/hbxbp/tests/demoxbp.prg
-    ! Fixed one warning which is discovered by István Bisz.
+    ! Fixed one warning which is discovered by Istvan Bisz.
       I was experimenting with other style sheet options.
 
 2009-08-25 20:18 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbqt/hbqt_slots.cpp
-    ! Fixed regression in 2009-08-22 22:33. Please test.
+    ! Fixed regression in 2009-08-22 22:33. Please test. [TESTED OK]
 
   * config/global.mk
     * Minor cosmetic.
diff --git a/harbour/config/global.mk b/harbour/config/global.mk
index b5bb31085b..02e2d62761 100644
--- a/harbour/config/global.mk
+++ b/harbour/config/global.mk
@@ -355,9 +355,11 @@ endif
 # Shell detection
 ifneq ($(SHLVL),)
    HB_SHELL := sh
+   SHELL := /bin/sh
 else
    ifeq ($(patsubst /bin/%sh,sh,$(SHELL)),sh)
       HB_SHELL := sh
+      SHELL := /bin/sh
    else
       ifneq ($(OS2_SHELL),)
          HB_SHELL := os2