From 5047203687b4452d38cfebbfc012ae2f6078b266 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Tue, 14 Jul 2009 18:41:35 +0000
Subject: [PATCH] 2009-07-14 20:39 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * source/pp/Makefile   * config/header.cf   *
 config/darwin/install.cf   * config/dos/install.cf   * config/doc.cf   *
 config/lib.cf   * config/win/install.cf   * config/bin.cf   *
 config/linux/install.cf   * config/os2/install.cf   * config/sunos/install.cf
   * config/bsd/install.cf   * config/wce/install.cf     * INSTALL_OBJS ->
 INSTALL_FILES     * INSTALL_DIRSH -> INSTALL_DIR_OS     * INSTALL_OBJSH,
 INSTALL_LIST -> INSTALL_FILES_OS

---
 harbour/ChangeLog                | 18 ++++++++++++++++++
 harbour/config/bin.cf            |  2 +-
 harbour/config/bsd/install.cf    |  2 +-
 harbour/config/darwin/install.cf |  4 ++--
 harbour/config/doc.cf            |  2 +-
 harbour/config/dos/install.cf    | 20 ++++++++++----------
 harbour/config/header.cf         |  2 +-
 harbour/config/lib.cf            |  2 +-
 harbour/config/linux/install.cf  | 12 ++++++------
 harbour/config/os2/install.cf    | 12 ++++++------
 harbour/config/sunos/install.cf  |  2 +-
 harbour/config/wce/install.cf    |  8 ++++----
 harbour/config/win/install.cf    |  8 ++++----
 harbour/source/pp/Makefile       |  2 +-
 14 files changed, 57 insertions(+), 39 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 08204f974c..81c5a10a42 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,24 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-07-14 20:39 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * source/pp/Makefile
+  * config/header.cf
+  * config/darwin/install.cf
+  * config/dos/install.cf
+  * config/doc.cf
+  * config/lib.cf
+  * config/win/install.cf
+  * config/bin.cf
+  * config/linux/install.cf
+  * config/os2/install.cf
+  * config/sunos/install.cf
+  * config/bsd/install.cf
+  * config/wce/install.cf
+    * INSTALL_OBJS -> INSTALL_FILES
+    * INSTALL_DIRSH -> INSTALL_DIR_OS
+    * INSTALL_OBJSH, INSTALL_LIST -> INSTALL_FILES_OS
+
 2009-07-14 20:10 UTC+0200 Lorenzo Fiorini (lorenzo.fiorini/at/gmail.com)
   * bin/hb-func.sh
     * add creation of unver harbour dll links in win/wce builds
diff --git a/harbour/config/bin.cf b/harbour/config/bin.cf
index 32e1b136f8..d828df3c6b 100644
--- a/harbour/config/bin.cf
+++ b/harbour/config/bin.cf
@@ -39,7 +39,7 @@ $(EXE_NAME) : $(ALL_OBJS)
 	$(LD_RULE)
 
 
-INSTALL_OBJS = $(EXE_ARCH)
+INSTALL_FILES = $(EXE_ARCH)
 INSTALL_DIR = $(HB_BIN_INSTALL)
 
 include $(TOP)$(ROOT)config/install.cf
diff --git a/harbour/config/bsd/install.cf b/harbour/config/bsd/install.cf
index 47dbdda067..f61059b4f6 100644
--- a/harbour/config/bsd/install.cf
+++ b/harbour/config/bsd/install.cf
@@ -7,7 +7,7 @@ INSTALL_RULE =\
 	then \
 	  echo "! Can't install, path not found: $(INSTALL_DIR)" 1>&2; \
 	else \
-	  for i in $(INSTALL_OBJS); \
+	  for i in $(INSTALL_FILES); \
 	  do \
 	    if [ -r $$i ]; \
 	    then \
diff --git a/harbour/config/darwin/install.cf b/harbour/config/darwin/install.cf
index 9e64496a60..b3202d4954 100644
--- a/harbour/config/darwin/install.cf
+++ b/harbour/config/darwin/install.cf
@@ -7,7 +7,7 @@ INSTALL_RULE =\
 	then \
 	  echo "! Can't install, path not found: $(INSTALL_DIR)" 1>&2; \
 	else \
-	  for i in $(INSTALL_OBJS); \
+	  for i in $(INSTALL_FILES); \
 	  do \
 	    if [ -r $$i ]; \
 	    then \
@@ -20,6 +20,6 @@ INSTALL_RULE =\
 	  done; \
 	  if [ $(INSTALL_DIR) = $(HB_LIB_INSTALL) ]; \
 	  then \
-	    $(RANLIB) $(foreach file,$(notdir $(INSTALL_OBJS)),$(INSTALL_DIR)/$(file)); \
+	    $(RANLIB) $(foreach file,$(notdir $(INSTALL_FILES)),$(INSTALL_DIR)/$(file)); \
 	  fi \
 	fi
diff --git a/harbour/config/doc.cf b/harbour/config/doc.cf
index eaf05ac19a..14b9410bb0 100644
--- a/harbour/config/doc.cf
+++ b/harbour/config/doc.cf
@@ -13,7 +13,7 @@ ifeq ($(HB_DOC_INSTALL),)
 install::
 
 else
-INSTALL_OBJS = $(DOC_FILES)
+INSTALL_FILES = $(DOC_FILES)
 INSTALL_DIR = $(HB_DOC_INSTALL)$(DOC_SUBDIR)
 
 include $(TOP)$(ROOT)config/install.cf
diff --git a/harbour/config/dos/install.cf b/harbour/config/dos/install.cf
index 0f265ee3a5..4db3868584 100644
--- a/harbour/config/dos/install.cf
+++ b/harbour/config/dos/install.cf
@@ -2,7 +2,7 @@
 # $Id$
 #
 
-ifeq ($(INSTALL_OBJS),) # Empty install list
+ifeq ($(INSTALL_FILES),) # Empty install list
 
 INSTALL_RULE = @echo Done
 
@@ -18,24 +18,24 @@ $(COMSPEC) /Cxcopy /Y /I $(file) $(subst /,\,$(INSTALL_DIR))
 
 endef
 
-INSTALL_LIST = $(subst /,\,$(INSTALL_OBJS))
-INSTALL_RULE = $(foreach file, $(INSTALL_LIST), $(inst_file))
+INSTALL_FILES_OS = $(subst /,\,$(INSTALL_FILES))
+INSTALL_RULE = $(foreach file, $(INSTALL_FILES_OS), $(inst_file))
 
 else  # bash
 
-INSTALL_DIRSH = $(subst \,/,$(INSTALL_DIR))
-INSTALL_OBJSH = $(subst \,/,$(INSTALL_OBJS))
+INSTALL_DIR_OS = $(subst \,/,$(INSTALL_DIR))
+INSTALL_FILES_OS = $(subst \,/,$(INSTALL_FILES))
 INSTALL_RULE =\
-	@sh -c 'if [ ! -d $(INSTALL_DIRSH) ]; \
+	@sh -c 'if [ ! -d $(INSTALL_DIR_OS) ]; \
 	then \
-	  echo "! Cannot install, path not found: $(INSTALL_DIRSH)" 1>&2; \
+	  echo "! Cannot install, path not found: $(INSTALL_DIR_OS)" 1>&2; \
 	else \
-	  for i in $(INSTALL_OBJSH); \
+	  for i in $(INSTALL_FILES_OS); \
 	  do \
 	    if [ -r $$i ]; \
 	    then \
-	      echo "! Installing $$i on $(INSTALL_DIRSH)"; \
-	      $(CP) $$i $(INSTALL_DIRSH); \
+	      echo "! Installing $$i on $(INSTALL_DIR_OS)"; \
+	      $(CP) $$i $(INSTALL_DIR_OS); \
 	      true; \
 	    else \
 	      echo "! Cannot install $$i, not found" 1>&2; \
diff --git a/harbour/config/header.cf b/harbour/config/header.cf
index ee88b1735f..1ab1ea02c8 100644
--- a/harbour/config/header.cf
+++ b/harbour/config/header.cf
@@ -15,7 +15,7 @@ ifeq ($(HB_INC_INSTALL),)
 install::
 
 else
-INSTALL_OBJS = $(ALL_HEADERS)
+INSTALL_FILES = $(ALL_HEADERS)
 INSTALL_DIR = $(HB_INC_INSTALL)
 
 include $(TOP)$(ROOT)config/install.cf
diff --git a/harbour/config/lib.cf b/harbour/config/lib.cf
index af1064a4d2..d2a1cf9e52 100644
--- a/harbour/config/lib.cf
+++ b/harbour/config/lib.cf
@@ -30,7 +30,7 @@ $(LIB_NAME) : $(ALL_OBJS)
 	$(AR_RULE)
 
 
-INSTALL_OBJS = $(LIB_ARCH)
+INSTALL_FILES = $(LIB_ARCH)
 INSTALL_DIR = $(HB_LIB_INSTALL)
 
 include $(TOP)$(ROOT)config/install.cf
diff --git a/harbour/config/linux/install.cf b/harbour/config/linux/install.cf
index a7233f3c77..f754829e2b 100644
--- a/harbour/config/linux/install.cf
+++ b/harbour/config/linux/install.cf
@@ -2,7 +2,7 @@
 # $Id$
 #
 
-ifeq ($(INSTALL_OBJS),) # Empty install list
+ifeq ($(INSTALL_FILES),) # Empty install list
 
 INSTALL_RULE = @echo Done
 
@@ -12,10 +12,10 @@ ifeq ($(SHLVL),) # non-bash
 
 ifeq ($(OS2_SHELL),) # non-OS/2
 
-INSTALL_LIST = $(subst /,\,$(INSTALL_OBJS))
+INSTALL_FILES_OS = $(subst /,\,$(INSTALL_FILES))
 
 INSTALL_RULE = \
-	-$(COMSPEC) /c for %%f in ($(INSTALL_LIST)) do copy "%%f" "$(subst /,\,$(INSTALL_DIR))"
+	-$(COMSPEC) /c for %%f in ($(INSTALL_FILES_OS)) do copy "%%f" "$(subst /,\,$(INSTALL_DIR))"
 
 else # OS/2
 
@@ -27,8 +27,8 @@ $(COMSPEC) /C $(CP) $(file) $(subst /,\,$(INSTALL_DIR))
 
 endef
 
-INSTALL_LIST = $(subst /,\,$(INSTALL_OBJS))
-INSTALL_RULE = $(foreach file, $(INSTALL_LIST), $(inst_file))
+INSTALL_FILES_OS = $(subst /,\,$(INSTALL_FILES))
+INSTALL_RULE = $(foreach file, $(INSTALL_FILES_OS), $(inst_file))
 
 endif
 
@@ -40,7 +40,7 @@ INSTALL_RULE =\
 	  echo "! Can't install, path not found: '$(INSTALL_DIR)'" 1>&2; \
 	  false; \
 	else \
-	  for i in $(INSTALL_OBJS); \
+	  for i in $(INSTALL_FILES); \
 	  do \
 	    if [ -r $$i ]; \
 	    then \
diff --git a/harbour/config/os2/install.cf b/harbour/config/os2/install.cf
index a7233f3c77..f754829e2b 100644
--- a/harbour/config/os2/install.cf
+++ b/harbour/config/os2/install.cf
@@ -2,7 +2,7 @@
 # $Id$
 #
 
-ifeq ($(INSTALL_OBJS),) # Empty install list
+ifeq ($(INSTALL_FILES),) # Empty install list
 
 INSTALL_RULE = @echo Done
 
@@ -12,10 +12,10 @@ ifeq ($(SHLVL),) # non-bash
 
 ifeq ($(OS2_SHELL),) # non-OS/2
 
-INSTALL_LIST = $(subst /,\,$(INSTALL_OBJS))
+INSTALL_FILES_OS = $(subst /,\,$(INSTALL_FILES))
 
 INSTALL_RULE = \
-	-$(COMSPEC) /c for %%f in ($(INSTALL_LIST)) do copy "%%f" "$(subst /,\,$(INSTALL_DIR))"
+	-$(COMSPEC) /c for %%f in ($(INSTALL_FILES_OS)) do copy "%%f" "$(subst /,\,$(INSTALL_DIR))"
 
 else # OS/2
 
@@ -27,8 +27,8 @@ $(COMSPEC) /C $(CP) $(file) $(subst /,\,$(INSTALL_DIR))
 
 endef
 
-INSTALL_LIST = $(subst /,\,$(INSTALL_OBJS))
-INSTALL_RULE = $(foreach file, $(INSTALL_LIST), $(inst_file))
+INSTALL_FILES_OS = $(subst /,\,$(INSTALL_FILES))
+INSTALL_RULE = $(foreach file, $(INSTALL_FILES_OS), $(inst_file))
 
 endif
 
@@ -40,7 +40,7 @@ INSTALL_RULE =\
 	  echo "! Can't install, path not found: '$(INSTALL_DIR)'" 1>&2; \
 	  false; \
 	else \
-	  for i in $(INSTALL_OBJS); \
+	  for i in $(INSTALL_FILES); \
 	  do \
 	    if [ -r $$i ]; \
 	    then \
diff --git a/harbour/config/sunos/install.cf b/harbour/config/sunos/install.cf
index 47dbdda067..f61059b4f6 100644
--- a/harbour/config/sunos/install.cf
+++ b/harbour/config/sunos/install.cf
@@ -7,7 +7,7 @@ INSTALL_RULE =\
 	then \
 	  echo "! Can't install, path not found: $(INSTALL_DIR)" 1>&2; \
 	else \
-	  for i in $(INSTALL_OBJS); \
+	  for i in $(INSTALL_FILES); \
 	  do \
 	    if [ -r $$i ]; \
 	    then \
diff --git a/harbour/config/wce/install.cf b/harbour/config/wce/install.cf
index 7eecddb3c0..2d94e52e93 100644
--- a/harbour/config/wce/install.cf
+++ b/harbour/config/wce/install.cf
@@ -2,7 +2,7 @@
 # $Id$
 #
 
-ifeq ($(INSTALL_OBJS),) # Empty install list
+ifeq ($(INSTALL_FILES),) # Empty install list
 
 INSTALL_RULE = @echo Done
 
@@ -10,10 +10,10 @@ else
 
 ifeq ($(SHLVL),) # non-bash
 
-INSTALL_LIST = $(subst /,\,$(INSTALL_OBJS))
+INSTALL_FILES_OS = $(subst /,\,$(INSTALL_FILES))
 
 INSTALL_RULE = \
-	-$(COMSPEC) /c for %%f in ($(INSTALL_LIST)) do copy "%%f" "$(subst /,\,$(INSTALL_DIR))"
+	-$(COMSPEC) /c for %%f in ($(INSTALL_FILES_OS)) do copy "%%f" "$(subst /,\,$(INSTALL_DIR))"
 
 else  # bash
 
@@ -23,7 +23,7 @@ INSTALL_RULE =\
 	  echo "! Can't install, path not found: '$(INSTALL_DIR)'" 1>&2; \
 	  false; \
 	else \
-	  for i in $(INSTALL_OBJS); \
+	  for i in $(INSTALL_FILES); \
 	  do \
 	    if [ -r $$i ]; \
 	    then \
diff --git a/harbour/config/win/install.cf b/harbour/config/win/install.cf
index 7eecddb3c0..2d94e52e93 100644
--- a/harbour/config/win/install.cf
+++ b/harbour/config/win/install.cf
@@ -2,7 +2,7 @@
 # $Id$
 #
 
-ifeq ($(INSTALL_OBJS),) # Empty install list
+ifeq ($(INSTALL_FILES),) # Empty install list
 
 INSTALL_RULE = @echo Done
 
@@ -10,10 +10,10 @@ else
 
 ifeq ($(SHLVL),) # non-bash
 
-INSTALL_LIST = $(subst /,\,$(INSTALL_OBJS))
+INSTALL_FILES_OS = $(subst /,\,$(INSTALL_FILES))
 
 INSTALL_RULE = \
-	-$(COMSPEC) /c for %%f in ($(INSTALL_LIST)) do copy "%%f" "$(subst /,\,$(INSTALL_DIR))"
+	-$(COMSPEC) /c for %%f in ($(INSTALL_FILES_OS)) do copy "%%f" "$(subst /,\,$(INSTALL_DIR))"
 
 else  # bash
 
@@ -23,7 +23,7 @@ INSTALL_RULE =\
 	  echo "! Can't install, path not found: '$(INSTALL_DIR)'" 1>&2; \
 	  false; \
 	else \
-	  for i in $(INSTALL_OBJS); \
+	  for i in $(INSTALL_FILES); \
 	  do \
 	    if [ -r $$i ]; \
 	    then \
diff --git a/harbour/source/pp/Makefile b/harbour/source/pp/Makefile
index 1a5ca75267..550fa0d89d 100644
--- a/harbour/source/pp/Makefile
+++ b/harbour/source/pp/Makefile
@@ -35,7 +35,7 @@ pptable.c : hbpp$(EXE_EXT)
 endif
 
 ifneq ($(HB_BIN_INSTALL),)
-INSTALL_OBJS = $(ARCH_DIR)/hbpp$(EXE_EXT)
+INSTALL_FILES = $(ARCH_DIR)/hbpp$(EXE_EXT)
 INSTALL_DIR = $(HB_BIN_INSTALL)
 HB_INSTALL_DEF=yes
 include $(TOP)$(ROOT)config/install.cf