fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2009-07-22 01:00 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* 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.
This commit is contained in:
Viktor Szakats
2009-07-21 23:01:20 +00:00
parent 8f8b8cbb3b
commit bed56bb8dc
4 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
harbour/ChangeLog
View File

@@ -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

2
harbour/config/dirsh.cf
View File

@@ -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

10
harbour/config/globsh.cf
View File

@@ -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

4
harbour/config/instsh.cf
View File

@@ -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)); \