From 51118c6d905573447ae146ca792d3d2374e1586b Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 10 Aug 2009 13:59:29 +0000 Subject: [PATCH] 2009-08-10 15:28 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) --- harbour/ChangeLog | 5 ++++ harbour/config/dirsh.cf | 22 ++++++++---------- harbour/config/instsh.cf | 49 +++++++++++++++++++--------------------- 3 files changed, 37 insertions(+), 39 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 86dc024431..186ef6b81e 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,11 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-08-10 15:58 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * config/instsh.cf + * config/dirsh.cf + * Changed TABs to spaces in some remaining places. + 2009-08-10 15:28 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * tests/hbpptest/Makefile * tests/Makefile diff --git a/harbour/config/dirsh.cf b/harbour/config/dirsh.cf index 1c0b474c42..4c8c049ca0 100644 --- a/harbour/config/dirsh.cf +++ b/harbour/config/dirsh.cf @@ -11,33 +11,30 @@ endif ifeq ($(DIRS),) # Empty directory list -DIR_RULE =\ - @echo Done +DIR_RULE := @echo Done else ifeq ($(HB_SHELL),sh) DIR_RULE =\ - @for d in $(DIRS); do \ - if [ -d "$$d" ]; then \ - $(MAKE) -C $$d $@; \ - fi \ - done + @for d in $(DIRS); do \ + if [ -d "$$d" ]; then \ + $(MAKE) -C $$d $@; \ + fi \ + done endif ifeq ($(HB_SHELL),nt) -DIR_RULE =\ - for %%d in ($(DIRS_OS)) do $(MK_OS) -C %%d $@ +DIR_RULE = for %%d in ($(DIRS_OS)) do $(MK_OS) -C %%d $@ endif ifeq ($(HB_SHELL),os2) -DIR_RULE =\ - for %d in ($(DIRS_OS)) do $(MK_OS) -C %d $@ +DIR_RULE = for %d in ($(DIRS_OS)) do $(MK_OS) -C %d $@ endif @@ -51,8 +48,7 @@ $(MK_OS) -C $(file) $@ endef -DIR_RULE =\ - $(foreach file, $(DIRS_OS), $(dir_mk)) +DIR_RULE = $(foreach file, $(DIRS_OS), $(dir_mk)) endif diff --git a/harbour/config/instsh.cf b/harbour/config/instsh.cf index 082f624b60..037cf64761 100644 --- a/harbour/config/instsh.cf +++ b/harbour/config/instsh.cf @@ -11,47 +11,45 @@ endif ifeq ($(INSTALL_FILES),) # Empty install list -INSTALL_RULE =\ - @echo Done +INSTALL_RULE := @echo Done else ifeq ($(INSTALL_DIR),) # Empty install dir -INSTALL_RULE =\ - @echo Done +INSTALL_RULE := @echo Done else ifeq ($(HB_SHELL),sh) INSTALL_RULE =\ - @$(MDP) $(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" ]; \ - then \ - echo "! Installing $$i on $(subst \,/,$(INSTALL_DIR))"; \ - $(CP) $$i $(subst \,/,$(INSTALL_DIR)); \ - true; \ - else \ - echo "! Can't install $$i, not found" 1>&2; \ - fi \ - done \ - fi + @$(MDP) $(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" ]; \ + then \ + echo "! Installing $$i on $(subst \,/,$(INSTALL_DIR))"; \ + $(CP) $$i $(subst \,/,$(INSTALL_DIR)); \ + true; \ + else \ + echo "! Can't install $$i, not found" 1>&2; \ + fi \ + done \ + fi endif ifeq ($(HB_SHELL),nt) INSTALL_RULE =\ - -$(CMDPREF)if not exist "$(INSTALL_DIR_OS)" $(MDP) "$(INSTALL_DIR_OS)" &\ - for %%f in ($(INSTALL_FILES_OS)) do copy "%%f" "$(INSTALL_DIR_OS)" + -$(CMDPREF)if not exist "$(INSTALL_DIR_OS)" $(MDP) "$(INSTALL_DIR_OS)" &\ + for %%f in ($(INSTALL_FILES_OS)) do copy "%%f" "$(INSTALL_DIR_OS)" endif @@ -91,8 +89,7 @@ $(CP) $(file) $(INSTALL_DIR_OS) endef -INSTALL_RULE =\ - $(inst_file_all) +INSTALL_RULE = $(inst_file_all) endif