From 7681ac96e86ea83b3fe975c92b93d0dd0207703e Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Tue, 18 Aug 2009 20:57:03 +0000
Subject: [PATCH] 2009-08-18 22:56 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * config/global.mk   * config/globsh.mk     * ECHOQUOTE variable
 moved to per shell sections.     ! ECHOQUOTE set to '"' for dos shells.

---
 harbour/ChangeLog        | 6 ++++++
 harbour/config/global.mk | 6 ------
 harbour/config/globsh.mk | 8 ++++++--
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 8d2757f674..e8ac95f37c 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,12 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-08-18 22:56 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * config/global.mk
+  * config/globsh.mk
+    * ECHOQUOTE variable moved to per shell sections.
+    ! ECHOQUOTE set to '"' for dos shells.
+
 2009-08-18 22:46 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * config/dos/watcom.mk
   * config/dos/djgpp.mk
diff --git a/harbour/config/global.mk b/harbour/config/global.mk
index ac019d35bf..bb7fedecb8 100644
--- a/harbour/config/global.mk
+++ b/harbour/config/global.mk
@@ -429,12 +429,6 @@ endif
 #   endif
 #endif
 
-ifeq ($(HB_SHELL),sh)
-   ECHOQUOTE := "
-else
-   ECHOQUOTE :=
-endif
-
 HB_HOST_CPU :=
 ifeq ($(HB_HOST_ARCH),win)
    ifeq ($(PROCESSOR_ARCHITECTURE),AMD64)
diff --git a/harbour/config/globsh.mk b/harbour/config/globsh.mk
index 46f1f32ae3..f7b3051cd7 100644
--- a/harbour/config/globsh.mk
+++ b/harbour/config/globsh.mk
@@ -36,6 +36,7 @@ CP := cp -f
 MD := mkdir
 MDP := mkdir -p
 ECHO := echo
+ECHOQUOTE := "
 
 dirbase::
 	@[ -d "$(OBJ_DIR)" ] || $(MDP) $(OBJ_DIR)
@@ -69,6 +70,7 @@ CP := copy
 MD := mkdir
 MDP := mkdir
 ECHO := echo
+ECHOQUOTE :=
 
 dirbase::
 	-@if not exist "$(OBJ_DIR_OS)" $(MDP) "$(OBJ_DIR_OS)"
@@ -91,11 +93,12 @@ ifeq ($(HB_SHELL),os2)
 
 MK := $(subst \,/,$(MAKE))
 RM := del /n
-RDP := $(TOOL_DIR)os2-rm -rf
+RDP := $(TOOL_DIR)os2-rm -fr
 CP := copy
 MD := mkdir
 MDP := $(TOOL_DIR)os2-mkdir -p
 ECHO := echo
+ECHOQUOTE :=
 
 dirbase::
 	-@if not exist $(OBJ_DIR_OS) $(MDP) $(OBJ_DIR)
@@ -118,6 +121,7 @@ CP := $(TOOL_DIR)dj-cp -f
 MD := $(TOOL_DIR)dj-mkdir
 MDP := $(TOOL_DIR)dj-mkdir -p
 ECHO := $(TOOL_DIR)dj-echo
+ECHOQUOTE := "
 
 dirbase::
 	-@$(MDP) $(OBJ_DIR_OS)
@@ -128,7 +132,7 @@ clean::
 	-@$(RDP) $(PKG_DIR_OS) $(OBJ_DIR_OS) $(LIB_FILE_OS) $(BIN_FILE_OS)
 	$(if $(LIB_FILE),-@$(RM) $(basename $(LIB_FILE_OS)).bak,)
 	$(if $(LIB_FILE),$(if $(wildcard $(LIB_DIR_OS)/*.*),,-@$(RDP) $(LIB_DIR_OS)),)
-	$(if $(BIN_FILE),-@$(RM) $(basename $(BIN_FILE_OS)).tds ,)
+	$(if $(BIN_FILE),-@$(RM) $(basename $(BIN_FILE_OS)).tds,)
 	$(if $(BIN_FILE),$(if $(wildcard $(BIN_DIR_OS)/*.*),,-@$(RDP) $(BIN_DIR_OS)),)
 
 endif