From e68440e2385bb8a89a137ec07327ac6b52796a67 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Fri, 21 Aug 2009 14:08:03 +0000
Subject: [PATCH] 2009-08-21 15:59 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * config/globsh.mk     ! Restored backslashes for GNU rm command
 for os2 shell.       It turns out rm needs backslashes in filenames (on
 contrary       to mkdir which needs forward slashes.) Not terribly
 consistent.       BTW they came from same packages.       Thanks to Maurilio
 Longo for the information.

  * source/pp/Makefile
    ! Readded empty line after pptable rule.
      I couldn't find the reason why this was needed, anyhow
      without it the dynamic hbpp obj deletion didn't work.
      Which GNU Make syntax rules am I forgetting? Any hints?

    ; TOFIX: Another issue has shown its ugly head, here clean
             in hbpp shows error message from 'del' command on
             nt shell deleting the .exe (and .tds), despite the
             file is there and we're doing wildcard check too.
             Ideas are welcome. This worked a few days ago.
---
 harbour/ChangeLog        |  7 +++++++
 harbour/config/globsh.mk | 21 +++++++++++++--------
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 7b0fb9c51f..3705cde3ca 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -18,6 +18,13 @@
 */
 
 2009-08-21 15:59 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * config/globsh.mk
+    ! Restored backslashes for GNU rm command for os2 shell.
+      It turns out rm needs backslashes in filenames (on contrary
+      to mkdir which needs forward slashes.) Not terribly consistent.
+      BTW they came from same packages.
+      Thanks to Maurilio Longo for the information.
+
   * source/pp/Makefile
     ! Readded empty line after pptable rule.
       I couldn't find the reason why this was needed, anyhow
diff --git a/harbour/config/globsh.mk b/harbour/config/globsh.mk
index 6d391b53ef..821fe2b665 100644
--- a/harbour/config/globsh.mk
+++ b/harbour/config/globsh.mk
@@ -104,6 +104,11 @@ endif
 
 ifeq ($(HB_SHELL),os2)
 
+# NOTE: Comment on included GNU tools:
+#       os2-mkdir expects forward slashes, while
+#       os2-rm expects backslashes in filenames.
+#       [vszakats]
+
 MK := $(subst \,/,$(MAKE))
 RM := del /n
 RDP := $(TOOL_DIR)os2-rm -fr
@@ -120,14 +125,14 @@ dirbase::
 	$(if $(DYN_FILE),-@$(MDP) $(DYN_DIR),)
 
 clean::
-	-@$(RDP) $(PKG_DIR) $(OBJ_DIR) $(LIB_FILE) $(BIN_FILE)
-	$(if $(LIB_FILE),-@$(RM) $(basename $(LIB_FILE)).bak,)
-	$(if $(LIB_FILE),$(if $(wildcard $(LIB_DIR)/*.*),,-@$(RDP) $(LIB_DIR)),)
-	$(if $(BIN_FILE),-@$(RM) $(basename $(BIN_FILE)).tds,)
-	$(if $(BIN_FILE),$(if $(wildcard $(BIN_DIR)/*.*),,-@$(RDP) $(BIN_DIR)),)
-	$(if $(DYN_FILE),-@$(RM) $(basename $(DYN_FILE)).def,)
-	$(if $(DYN_FILE),-@$(RM) $(basename $(DYN_FILE)).exp,)
-	$(if $(DYN_FILE),$(if $(wildcard $(DYN_DIR)/*.*),,-@$(RDP) $(DYN_DIR)),)
+	-@$(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)/*.*),,-@$(RDP) $(LIB_DIR_OS)),)
+	$(if $(BIN_FILE),-@$(RM) $(basename $(BIN_FILE_OS)).tds,)
+	$(if $(BIN_FILE),$(if $(wildcard $(BIN_DIR)/*.*),,-@$(RDP) $(BIN_DIR_OS)),)
+	$(if $(DYN_FILE),-@$(RM) $(basename $(DYN_FILE_OS)).def,)
+	$(if $(DYN_FILE),-@$(RM) $(basename $(DYN_FILE_OS)).exp,)
+	$(if $(DYN_FILE),$(if $(wildcard $(DYN_DIR)/*.*),,-@$(RDP) $(DYN_DIR_OS)),)
 
 endif