From 5e3d7296a288f8732d02771d31dc475027286197 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Tue, 8 Sep 2009 09:13:47 +0000
Subject: [PATCH] 2009-09-08 11:13 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * config/global.mk     ! Corrected typo in de-xmastree patch.
 Symptom was broken       shell detection on os2.

---
 harbour/ChangeLog        |  5 +++++
 harbour/config/global.mk | 40 +++++++++++++++++++++-------------------
 2 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index f00915c575..d6a66009ea 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,11 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-09-08 11:13 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * config/global.mk
+    ! Corrected typo in de-xmastree patch. Symptom was broken
+      shell detection on os2.
+
 2009-09-08 10:04 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbnetio/utils/netiosrv.prg
     + Added 'root' cmdline parameter.
diff --git a/harbour/config/global.mk b/harbour/config/global.mk
index ae908d5c70..ffc4194526 100644
--- a/harbour/config/global.mk
+++ b/harbour/config/global.mk
@@ -300,26 +300,28 @@ else
    else ifneq ($(OS2_SHELL),)
       HB_SHELL := os2
       SHELL := $(COMSPEC)
-   else ifneq ($(ComSpec),)
-      COMSPEC := $(ComSpec)
-   endif
-   ifeq ($(COMSPEC),)
-      ifeq ($(OS),Windows_NT)
-         COMSPEC := cmd.exe
-      else
-         COMSPEC := command.com
-      endif
-   endif
-   SHELL := $(COMSPEC)
-   ifneq ($(findstring COMMAND,$(COMSPEC)),)
-      HB_SHELL := dos
-   else ifneq ($(findstring command,$(COMSPEC)),)
-      HB_SHELL := dos
    else
-      HB_SHELL := nt
-      _VER := $(shell ver)
-      ifeq ($(strip $(findstring 3.5,$(shell ver))$(findstring 4.0,$(shell ver))$(findstring 5.0,$(shell ver))),)
-         HB_SHELL_XP := (xp)
+      ifneq ($(ComSpec),)
+         COMSPEC := $(ComSpec)
+      endif
+      ifeq ($(COMSPEC),)
+         ifeq ($(OS),Windows_NT)
+            COMSPEC := cmd.exe
+         else
+            COMSPEC := command.com
+         endif
+      endif
+      SHELL := $(COMSPEC)
+      ifneq ($(findstring COMMAND,$(COMSPEC)),)
+         HB_SHELL := dos
+      else ifneq ($(findstring command,$(COMSPEC)),)
+         HB_SHELL := dos
+      else
+         HB_SHELL := nt
+         _VER := $(shell ver)
+         ifeq ($(strip $(findstring 3.5,$(shell ver))$(findstring 4.0,$(shell ver))$(findstring 5.0,$(shell ver))),)
+            HB_SHELL_XP := (xp)
+         endif
       endif
    endif
 endif