From ec7392f320052c6f4e3659d1c92d6c322c04d450 Mon Sep 17 00:00:00 2001
From: "David G. Holm" <dholm@jsd-llc.com>
Date: Mon, 21 Feb 2000 20:55:53 +0000
Subject: [PATCH] See ChangeLog entry 2000-02-21 15:45 GMT-5 David G. Holm
 <dholm@ sd-llc.com>

---
 harbour/ChangeLog            |  6 ++++++
 harbour/config/rules.cf      |  4 ++++
 harbour/config/w32/bcc32.cf  |  2 +-
 harbour/config/w32/global.cf | 30 +++++++++++++++++++++---------
 4 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 58e01bc957..eb1948b4ab 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,9 @@
+2000-02-21 15:45 GMT-5 David G. Holm <dholm@ sd-llc.com>
+   * config/rules.cf
+   * config/w32/bcc32.cf
+   * config/w32/global.cf
+     % Changes to make more compatible with all Windows 32-bit platforms
+
 20000221-14:58 GMT+3 Alexander Kresin
    * source/pp/stdalone/hbpp.c
    * source/pp/hbppint.c
diff --git a/harbour/config/rules.cf b/harbour/config/rules.cf
index ef07b5ea6a..f063b0b1de 100644
--- a/harbour/config/rules.cf
+++ b/harbour/config/rules.cf
@@ -69,6 +69,10 @@ endif
 %.c : $(GRANDP)%.prg
 	$(HB) $? $(PRG_USR) $(HB_FLAGS)
 
+ifeq ($(SHLVL),) # COMMAND.COM
+# Do nothing. the $(hb_architecture)/global.cf will handle clean up.
+else
 # Generic rule to clean up.
 clean::
 	-$(RM) *.bak *.obj core *.core *~ *.o
+endif
\ No newline at end of file
diff --git a/harbour/config/w32/bcc32.cf b/harbour/config/w32/bcc32.cf
index cc133e59ee..bf4cb4ddec 100644
--- a/harbour/config/w32/bcc32.cf
+++ b/harbour/config/w32/bcc32.cf
@@ -23,7 +23,7 @@ endif
 CC = bcc32
 CC_IN = -c
 CC_OUT = -o
-CPPFLAGS = -I$(GRANDP) -I$(_HB_INC_COMPILE) -DHARBOUR_USE_WIN_GTAPI
+CPPFLAGS = -I$(GRANDP) -I$(HB_INC_COMPILE) -DHARBOUR_USE_WIN_GTAPI
 CFLAGS = -O2 -d
 
 LD = bcc32
diff --git a/harbour/config/w32/global.cf b/harbour/config/w32/global.cf
index ce8ef35e05..7a15b9be31 100644
--- a/harbour/config/w32/global.cf
+++ b/harbour/config/w32/global.cf
@@ -7,24 +7,36 @@ all : first
 
 ifeq ($(SHLVL),) # COMMAND.COM
 
-ARCH_DIR = $(subst /,\,$(ARCH)\)
-MK = $(subst /,\,$(subst \~,~,$(MAKE)))
+# There is a conflict with the use of '\' and '/' characters
+# The MAKE requires '/' in filenames (ARCH_DIR) however some compilers
+# and some DOS commands require '\' (ARCH_DOS)
+ARCH_DIR = $(subst \,/,$(ARCH))
+ARCH_DOS = $(subst /,\,$(ARCH))
+MK := $(subst \,/,$(subst \~,~,$(MAKE)))
 
-RM = del /q
+ifeq ($(COMSPEC),) #location of command.com
+  COMSPEC := command.com
+endif
+
+RM = del
 RD = rmdir
 CP = copy
 MV = move
 MD = md
 
 dirbase::
-	-$(MD) $(HB_ARCHITECTURE) >NUL
-	-$(MD) $(ARCH_DIR) >NUL
-
+	-if not exist $(HB_ARCHITECTURE) $(MD) $(HB_ARCHITECTURE)
+	-if not exist $(ARCH_DOS)        $(MD) $(ARCH_DOS)
 
 clean::
-	-$(RM) $(ARCH_DIR)\*.*
-	-$(RD) $(ARCH_DIR)
-
+	-for %f in ($(ARCH_DOS)\*.*) do @$(RM) %f
+	-if exist *.bak $(RM) *.bak
+	-if exist *.obj $(RM) *.obj
+	-if exist core $(RM) core
+	-if exist *.o $(RM) *.o
+	-if exist *.tds $(RM) *.tds
+	-$(RD) $(ARCH_DOS)
+	-$(RD) $(HB_ARCHITECTURE)
 else  # bash
 
 ARCH_DIR = $(ARCH)/