From bed56bb8dc629704570f07e1ec1b07d61cdcb2b9 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Tue, 21 Jul 2009 23:01:20 +0000
Subject: [PATCH] 2009-07-22 01:00 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * config/instsh.cf   * config/dirsh.cf   * config/globsh.cf    
 ! Added double quotes to all 'if [ -? * ]' expressions:       'if [ -? "*"
 ]'. This fixes clean rule in Solaris builds       '[ -z $(EXE_FILE) ]' when
 $(EXE_FILE) was empty.       (Thanks for Tamas Tevesz for report and fix
 suggestion)       Please speak up if there is any reason why double quotes   
    weren't used in bash commands embedded in .cf files while       they are
 consistently used in all .sh files.

---
 harbour/ChangeLog        | 12 ++++++++++++
 harbour/config/dirsh.cf  |  2 +-
 harbour/config/globsh.cf | 10 +++++-----
 harbour/config/instsh.cf |  4 ++--
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index f9459089d3..c3529cf224 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,18 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-07-22 01:00 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * config/instsh.cf
+  * config/dirsh.cf
+  * config/globsh.cf
+    ! Added double quotes to all 'if [ -? * ]' expressions:
+      'if [ -? "*" ]'. This fixes clean rule in Solaris builds
+      '[ -z $(EXE_FILE) ]' when $(EXE_FILE) was empty.
+      (Thanks for Tamas Tevesz for report and fix suggestion)
+      Please speak up if there is any reason why double quotes
+      weren't used in bash commands embedded in .cf files while
+      they are consistently used in all .sh files.
+
 2009-07-21 14:17 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
   * contrib/hbqt/hbqt_slots.cpp
   * contrib/hbqt/hbqt_slots.h
diff --git a/harbour/config/dirsh.cf b/harbour/config/dirsh.cf
index 7c0c4bec93..2ca85e059f 100644
--- a/harbour/config/dirsh.cf
+++ b/harbour/config/dirsh.cf
@@ -20,7 +20,7 @@ ifeq ($(HB_SHELL),sh)
 
 DIR_RULE =\
 	@for d in $(DIRS); do \
-	  if [ -d $$d ]; then \
+	  if [ -d "$$d" ]; then \
 	    $(MAKE) -C $$d $@; \
 	  fi \
 	done
diff --git a/harbour/config/globsh.cf b/harbour/config/globsh.cf
index dd544e14ea..61891ad3a3 100644
--- a/harbour/config/globsh.cf
+++ b/harbour/config/globsh.cf
@@ -30,17 +30,17 @@ MD = mkdir
 MDP = mkdir -p
 
 dirbase::
-	@[ -d $(OBJ_DIR) ] || $(MDP) $(OBJ_DIR)
-	@[ -z $(LIB_FILE) ] || [ -d $(LIB_DIR) ] || $(MDP) $(LIB_DIR)
-	@[ -z $(EXE_FILE) ] || [ -d $(EXE_DIR) ] || $(MDP) $(EXE_DIR)
+	@[ -d "$(OBJ_DIR)" ] || $(MDP) $(OBJ_DIR)
+	@[ -z "$(LIB_FILE)" ] || [ -d "$(LIB_DIR)" ] || $(MDP) $(LIB_DIR)
+	@[ -z "$(EXE_FILE)" ] || [ -d "$(EXE_DIR)" ] || $(MDP) $(EXE_DIR)
 
 clean::
 	-@$(RDP) $(OBJ_DIR) $(LIB_FILE) $(EXE_FILE); \
-	if [ -n $(LIB_FILE) ]; then \
+	if [ -n "$(LIB_FILE)" ]; then \
 	   $(RM) $(basename $(LIB_FILE)).bak; \
 	   [ "`echo $(LIB_DIR)/*`" != "$(LIB_DIR)/*" ] || $(RDP) $(LIB_DIR); \
 	fi ; \
-	if [ -n $(EXE_FILE) ]; then \
+	if [ -n "$(EXE_FILE)" ]; then \
 	   $(RM) $(basename $(EXE_FILE)).tds; \
 	   [ "`echo $(EXE_DIR)/*`" != "$(EXE_DIR)/*" ] || $(RDP) $(EXE_DIR); \
 	fi
diff --git a/harbour/config/instsh.cf b/harbour/config/instsh.cf
index 6cad957fda..f1aefaad28 100644
--- a/harbour/config/instsh.cf
+++ b/harbour/config/instsh.cf
@@ -27,14 +27,14 @@ ifeq ($(HB_SHELL),sh)
 
 INSTALL_RULE =\
 	@$(MDP) $(subst \,/,$(INSTALL_DIR)); \
-	if [ ! -d $(subst \,/,$(INSTALL_DIR)) ]; \
+	if [ ! -d "$(subst \,/,$(INSTALL_DIR))" ]; \
 	then \
 	   echo "! Can't install, path not found: '$(subst \,/,$(INSTALL_DIR))'" 1>&2; \
 	   false; \
 	else \
 	   for i in $(INSTALL_FILES); \
 	   do \
-	      if [ -r $$i ]; \
+	      if [ -r "$$i" ]; \
 	      then \
 	         echo "! Installing $$i on $(subst \,/,$(INSTALL_DIR))"; \
 	         $(CP) $$i $(subst \,/,$(INSTALL_DIR)); \