From 46ce9925cfeeada23021b594eaba820a83b7d21d Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Thu, 16 Jul 2009 18:04:55 +0000
Subject: [PATCH] 2009-07-16 20:02 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * bin/postinst.bat     ! Fixed for MS-DOS. Again.       Here
 ChangeLog again causes some problems.

  * config/globsh.cf
    % Removed some redundancy regarding tool path forming.
---
 harbour/ChangeLog        |  8 ++++++++
 harbour/bin/postinst.bat | 25 ++++++++++++++-----------
 harbour/config/globsh.cf | 22 ++++++++++++----------
 3 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index a331666e21..957b619fb3 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,14 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-07-16 20:02 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * bin/postinst.bat
+    ! Fixed for MS-DOS. Again.
+      Here ChangeLog again causes some problems.
+
+  * config/globsh.cf
+    % Removed some redundancy regarding tool path forming.
+
 2009-07-16 19:34 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   - harbour/source/nulrtl
   - harbour/source/nulrtl/nulrtl.c
diff --git a/harbour/bin/postinst.bat b/harbour/bin/postinst.bat
index 48614b78f2..06e74e5c91 100644
--- a/harbour/bin/postinst.bat
+++ b/harbour/bin/postinst.bat
@@ -22,17 +22,6 @@ echo libpaths=../contrib/rddsql/%%{hb_name}>> %HB_BIN_INSTALL%\hbmk.cfg
 echo libpaths=../addons/%%{hb_name}>> %HB_BIN_INSTALL%\hbmk.cfg
 echo libpaths=../examples/%%{hb_name}>> %HB_BIN_INSTALL%\hbmk.cfg
 
-rem ; Post-build installation
-set _HB_COPYCMD=%COPYCMD%
-set COPYCMD=/Y
-if not "%HB_INSTALL_PREFIX%" == "" copy ChangeLog* "%HB_INSTALL_PREFIX%\" > nul
-if not "%HB_INSTALL_PREFIX%" == "" copy COPYING    "%HB_INSTALL_PREFIX%\" > nul
-if not "%HB_INSTALL_PREFIX%" == "" copy ERRATA     "%HB_INSTALL_PREFIX%\" > nul
-if not "%HB_INSTALL_PREFIX%" == "" copy INSTALL    "%HB_INSTALL_PREFIX%\" > nul
-if not "%HB_INSTALL_PREFIX%" == "" copy TODO       "%HB_INSTALL_PREFIX%\" > nul
-set COPYCMD=%_HB_COPYCMD%
-set _HB_COPYCMD=
-
 goto INST_%HB_ARCHITECTURE%
 
 :INST_WIN
@@ -43,6 +32,13 @@ goto INST_%HB_ARCHITECTURE%
    if not "%OS%" == "Windows_NT" echo This Harbour build script requires Windows NT or upper.
    if not "%OS%" == "Windows_NT" goto END
 
+   rem ; Post-build installation
+   if not "%HB_INSTALL_PREFIX%" == "" copy ChangeLog* "%HB_INSTALL_PREFIX%\" > nul
+   if not "%HB_INSTALL_PREFIX%" == "" copy COPYING    "%HB_INSTALL_PREFIX%\" > nul
+   if not "%HB_INSTALL_PREFIX%" == "" copy ERRATA     "%HB_INSTALL_PREFIX%\" > nul
+   if not "%HB_INSTALL_PREFIX%" == "" copy INSTALL    "%HB_INSTALL_PREFIX%\" > nul
+   if not "%HB_INSTALL_PREFIX%" == "" copy TODO       "%HB_INSTALL_PREFIX%\" > nul
+
    if "%HB_COMPILER%" == "mingw"    set HB_DYNLIB=yes
    if "%HB_COMPILER%" == "mingw64"  set HB_DYNLIB=yes
    if "%HB_COMPILER%" == "mingwarm" set HB_DYNLIB=yes
@@ -77,6 +73,13 @@ goto INST_%HB_ARCHITECTURE%
 
 :INST_DOS
 
+   rem ; Post-build installation
+   if not "%HB_INSTALL_PREFIX%" == "" copy CHANG*     %HB_INSTALL_PREFIX%\CHANGES > nul
+   if not "%HB_INSTALL_PREFIX%" == "" copy COPYING    %HB_INSTALL_PREFIX% > nul
+   if not "%HB_INSTALL_PREFIX%" == "" copy ERRATA     %HB_INSTALL_PREFIX% > nul
+   if not "%HB_INSTALL_PREFIX%" == "" copy INSTALL    %HB_INSTALL_PREFIX% > nul
+   if not "%HB_INSTALL_PREFIX%" == "" copy TODO       %HB_INSTALL_PREFIX% > nul
+
    rem DOS post install part
    goto END
 
diff --git a/harbour/config/globsh.cf b/harbour/config/globsh.cf
index ef8ac66e07..edd8dff071 100644
--- a/harbour/config/globsh.cf
+++ b/harbour/config/globsh.cf
@@ -12,11 +12,11 @@ ifneq ($(HB_SHELL),bash)
 
 DIRSEP = $(subst /,\,\)
 
-OBJ_DIR_OS      = $(subst /,\,$(OBJ_DIR))
-LIB_DIR_OS      = $(subst /,\,$(LIB_DIR))
-LIB_FILE_OS     = $(subst /,\,$(LIB_FILE))
-EXE_DIR_OS      = $(subst /,\,$(EXE_DIR))
-EXE_FILE_OS     = $(subst /,\,$(EXE_FILE))
+OBJ_DIR_OS  = $(subst /,\,$(OBJ_DIR))
+LIB_DIR_OS  = $(subst /,\,$(LIB_DIR))
+LIB_FILE_OS = $(subst /,\,$(LIB_FILE))
+EXE_DIR_OS  = $(subst /,\,$(EXE_DIR))
+EXE_FILE_OS = $(subst /,\,$(EXE_FILE))
 
 endif
 
@@ -91,13 +91,15 @@ endif
 
 ifeq ($(HB_SHELL),dos)
 
+TOOL_DIR := $(subst /,\,$(TOP)$(ROOT)config/)
+
 MK = $(subst \,/,$(subst \~,~,$(MAKE)))
-RM = $(subst /,\,$(TOP)$(ROOT)config/dj-rm.exe) -f
-RD = $(subst /,\,$(TOP)$(ROOT)config/dj-rm.exe) -f -r
-CP = $(subst /,\,$(TOP)$(ROOT)config/dj-cp.exe) -f
+RM = $(TOOL_DIR)dj-rm.exe -f
+RD = $(TOOL_DIR)dj-rm.exe -f -r
+CP = $(TOOL_DIR)dj-cp.exe -f
 MV = move
-MD = $(subst /,\,$(TOP)$(ROOT)config/dj-mkdir.exe)
-MDP = $(subst /,\,$(TOP)$(ROOT)config/dj-mkdir.exe) -p
+MD = $(TOOL_DIR)dj-mkdir.exe
+MDP = $(TOOL_DIR)dj-mkdir.exe -p
 
 dirbase::
 	-@$(CMDPREF)if not exist $(OBJ_DIR_OS)\nul $(MDP) $(OBJ_DIR_OS)