From 7fecdbfec5fc9ff2163e76c316b33389dced3778 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Tue, 14 Jul 2009 18:48:25 +0000
Subject: [PATCH] 2009-07-14 20:48 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * config/dos/install.cf   * config/win/install.cf   *
 config/linux/install.cf   * config/os2/install.cf   * config/wce/install.cf  
   * Using INSTALL_DIR_OS temp var instead of doing OS conversion inline.

---
 harbour/ChangeLog               | 8 ++++++++
 harbour/config/dos/install.cf   | 3 ++-
 harbour/config/linux/install.cf | 3 ++-
 harbour/config/os2/install.cf   | 3 ++-
 harbour/config/wce/install.cf   | 3 ++-
 harbour/config/win/install.cf   | 3 ++-
 6 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 97fa54345f..1547548f6d 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,14 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-07-14 20:48 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * config/dos/install.cf
+  * config/win/install.cf
+  * config/linux/install.cf
+  * config/os2/install.cf
+  * config/wce/install.cf
+    * Using INSTALL_DIR_OS temp var instead of doing OS conversion inline.
+
 2009-07-14 20:42 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * config/hpux/dir.cf
   * config/darwin/dir.cf
diff --git a/harbour/config/dos/install.cf b/harbour/config/dos/install.cf
index 4db3868584..c5a34d58db 100644
--- a/harbour/config/dos/install.cf
+++ b/harbour/config/dos/install.cf
@@ -14,10 +14,11 @@ ifeq ($(SHLVL),) # non-bash
 # NOTE: The empty line directly before 'endef' HAVE TO exist!
 # It causes that every commands will be separated by LF
 define inst_file
-$(COMSPEC) /Cxcopy /Y /I $(file) $(subst /,\,$(INSTALL_DIR))
+$(COMSPEC) /Cxcopy /Y /I $(file) $(INSTALL_DIR_OS)
 
 endef
 
+INSTALL_DIR_OS = $(subst /,\,$(INSTALL_DIR))
 INSTALL_FILES_OS = $(subst /,\,$(INSTALL_FILES))
 INSTALL_RULE = $(foreach file, $(INSTALL_FILES_OS), $(inst_file))
 
diff --git a/harbour/config/linux/install.cf b/harbour/config/linux/install.cf
index f754829e2b..2629476f95 100644
--- a/harbour/config/linux/install.cf
+++ b/harbour/config/linux/install.cf
@@ -12,10 +12,11 @@ ifeq ($(SHLVL),) # non-bash
 
 ifeq ($(OS2_SHELL),) # non-OS/2
 
+INSTALL_DIR_OS = $(subst /,\,$(INSTALL_DIR))
 INSTALL_FILES_OS = $(subst /,\,$(INSTALL_FILES))
 
 INSTALL_RULE = \
-	-$(COMSPEC) /c for %%f in ($(INSTALL_FILES_OS)) do copy "%%f" "$(subst /,\,$(INSTALL_DIR))"
+	-$(COMSPEC) /c for %%f in ($(INSTALL_FILES_OS)) do copy "%%f" "$(INSTALL_DIR_OS)"
 
 else # OS/2
 
diff --git a/harbour/config/os2/install.cf b/harbour/config/os2/install.cf
index f754829e2b..2629476f95 100644
--- a/harbour/config/os2/install.cf
+++ b/harbour/config/os2/install.cf
@@ -12,10 +12,11 @@ ifeq ($(SHLVL),) # non-bash
 
 ifeq ($(OS2_SHELL),) # non-OS/2
 
+INSTALL_DIR_OS = $(subst /,\,$(INSTALL_DIR))
 INSTALL_FILES_OS = $(subst /,\,$(INSTALL_FILES))
 
 INSTALL_RULE = \
-	-$(COMSPEC) /c for %%f in ($(INSTALL_FILES_OS)) do copy "%%f" "$(subst /,\,$(INSTALL_DIR))"
+	-$(COMSPEC) /c for %%f in ($(INSTALL_FILES_OS)) do copy "%%f" "$(INSTALL_DIR_OS)"
 
 else # OS/2
 
diff --git a/harbour/config/wce/install.cf b/harbour/config/wce/install.cf
index 2d94e52e93..f238047dd3 100644
--- a/harbour/config/wce/install.cf
+++ b/harbour/config/wce/install.cf
@@ -10,10 +10,11 @@ else
 
 ifeq ($(SHLVL),) # non-bash
 
+INSTALL_DIR_OS = $(subst /,\,$(INSTALL_DIR))
 INSTALL_FILES_OS = $(subst /,\,$(INSTALL_FILES))
 
 INSTALL_RULE = \
-	-$(COMSPEC) /c for %%f in ($(INSTALL_FILES_OS)) do copy "%%f" "$(subst /,\,$(INSTALL_DIR))"
+	-$(COMSPEC) /c for %%f in ($(INSTALL_FILES_OS)) do copy "%%f" "$(INSTALL_DIR_OS)"
 
 else  # bash
 
diff --git a/harbour/config/win/install.cf b/harbour/config/win/install.cf
index 2d94e52e93..f238047dd3 100644
--- a/harbour/config/win/install.cf
+++ b/harbour/config/win/install.cf
@@ -10,10 +10,11 @@ else
 
 ifeq ($(SHLVL),) # non-bash
 
+INSTALL_DIR_OS = $(subst /,\,$(INSTALL_DIR))
 INSTALL_FILES_OS = $(subst /,\,$(INSTALL_FILES))
 
 INSTALL_RULE = \
-	-$(COMSPEC) /c for %%f in ($(INSTALL_FILES_OS)) do copy "%%f" "$(subst /,\,$(INSTALL_DIR))"
+	-$(COMSPEC) /c for %%f in ($(INSTALL_FILES_OS)) do copy "%%f" "$(INSTALL_DIR_OS)"
 
 else  # bash