From 5a9ef2078039b93c4ae78d04a3760b61ade17393 Mon Sep 17 00:00:00 2001
From: Przemyslaw Czerpak <druzus@priv.onet.pl>
Date: Tue, 11 Aug 2009 13:25:32 +0000
Subject: [PATCH] 2009-08-11 15:25 UTC+0200 Przemyslaw Czerpak
 (druzus/at/priv.onet.pl)   * harbour/config/os2/watcom.cf     ! fixed FOR
 command in WINNT->OS2 cross builds. Please test if       it works - I cannot
 without real Windows cmd.exe

---
 harbour/ChangeLog            |  5 +++++
 harbour/config/os2/watcom.cf | 11 ++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 4fdc0b4bba..19dbd12b6f 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,11 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-08-11 15:25 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/config/os2/watcom.cf
+    ! fixed FOR command in WINNT->OS2 cross builds. Please test if
+      it works - I cannot without real Windows cmd.exe
+
 2009-08-11 15:04 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * config/none.cf
   * config/lib.cf
diff --git a/harbour/config/os2/watcom.cf b/harbour/config/os2/watcom.cf
index 243a23d00c..69ea07d6cb 100644
--- a/harbour/config/os2/watcom.cf
+++ b/harbour/config/os2/watcom.cf
@@ -78,7 +78,9 @@ LDLIBS_COMMA := $(subst $(subst x,x, ),$(comma) ,$(strip $(LDLIBS)))
 LD_RULE = $(LD) $(LDFLAGS) $(HB_USER_LDFLAGS) NAME $(BIN_DIR)/$@ FILE $(LDFILES_COMMA) $(if $(LDLIBS_COMMA), LIB $(LDLIBS_COMMA),)
 
 ifeq ($(HB_SHELL),sh)
+
 create_library = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) $(LIB_DIR)/$@ $(foreach file,$(^F),-+$(file))
+
 else
 # maximum size of command line in OS2 is limited to 1024 characters
 # the trick with divided 'wordlist' is workaround for it:
@@ -88,11 +90,18 @@ else
 # anyhow OS2 port# of GNU make 3.81 seems to have bug and GPFs when total
 # commands length is too big so for %i in ( *$(OBJ_EXT) ) do ... below is
 # ugly workaround for both problems
+
+ifeq ($(HB_SHELL),nt)
+FILE := %%f
+else
+FILE := %f
+endif
 define create_library
 echo $(LIB_DIR)/$@ > __lib__.tmp
-for %i in ( *$(OBJ_EXT) ) do @echo -+%i >> __lib__.tmp
+for $(FILE) in ( *$(OBJ_EXT) ) do @echo -+$(FILE) >> __lib__.tmp
 $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) @__lib__.tmp
 endef
+
 endif
 
 AR := wlib