From 2e24252ab60f2d8f1d7a08ee978dfc5bb7023d80 Mon Sep 17 00:00:00 2001
From: Przemyslaw Czerpak <druzus@priv.onet.pl>
Date: Tue, 18 Aug 2009 21:32:51 +0000
Subject: [PATCH] 2009-08-18 23:32 UTC+0200 Przemyslaw Czerpak
 (druzus/at/priv.onet.pl)   * harbour/config/win/bcc.mk     * eliminated IF
 EXIST command and updated to work with non NT shells.       Now only OS2
 gcc.mk and watcom.mk uses directly IF & FOR shell       commands.

---
 harbour/ChangeLog         |  6 ++++++
 harbour/config/win/bcc.mk | 10 ++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index e8ac95f37c..543185d792 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,12 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-08-18 23:32 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/config/win/bcc.mk
+    * eliminated IF EXIST command and updated to work with non NT shells.
+      Now only OS2 gcc.mk and watcom.mk uses directly IF & FOR shell
+      commands.
+
 2009-08-18 22:56 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * config/global.mk
   * config/globsh.mk
diff --git a/harbour/config/win/bcc.mk b/harbour/config/win/bcc.mk
index c66437f0aa..a8706a5d98 100644
--- a/harbour/config/win/bcc.mk
+++ b/harbour/config/win/bcc.mk
@@ -52,18 +52,24 @@ ARFLAGS := /P64
 
 ifneq ($(HB_SHELL),sh)
 
+   ifeq ($(HB_SHELL),nt)
+      LINECONT := ^&
+   else
+      LINECONT := &
+   endif
+
    # NOTE: Command-line limit length defeating methods found below
    #       are only needed to support pre-Windows XP systems, where
    #       limit is 2047 chars. [vszakats]
 
    # NOTE: The empty line directly before 'endef' HAVE TO exist!
    define lib_object
-      @$(ECHO) -+$(subst /,\,$(file)) ^& >> __lib__.tmp
+      @$(ECHO) $(ECHOQUOTE)-+$(subst /,\,$(file)) $(LINECONT)$(ECHOQUOTE) >> __lib__.tmp
 
    endef
 
    define create_library
-      @if exist __lib__.tmp del __lib__.tmp
+      @$(ECHO) $(ECHOQUOTE)-+ $(LINECONT)$(ECHOQUOTE) > __lib__.tmp
       $(foreach file,$(^F),$(lib_object))
       @$(ECHO) -+>> __lib__.tmp
       $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) "$(subst /,\,$(LIB_DIR)/$@)" @__lib__.tmp