From 1674d71a46671b4870099d0ae223bf1302385444 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Mon, 7 Sep 2009 10:03:48 +0000
Subject: [PATCH] 2009-09-07 12:03 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * bin/postinst.bat     + Installation of hb-mkimp.bat will now
 be done automatically       at postinst phase for win/wce targets.

  * config/detect.mk
    ! Fixed HB_INC_WATT handling if it contained backslashes
      (broken after last commit)
    % Avoid using indirect assigment by moving it after detection
      function (it was a mistake in my previous commit).
---
 harbour/ChangeLog        | 11 +++++++++++
 harbour/bin/postinst.bat |  5 +++++
 harbour/config/detect.mk |  6 +++---
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index a30393918b..939806204a 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,17 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-09-07 12:03 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * bin/postinst.bat
+    + Installation of hb-mkimp.bat will now be done automatically
+      at postinst phase for win/wce targets.
+
+  * config/detect.mk
+    ! Fixed HB_INC_WATT handling if it contained backslashes
+      (broken after last commit)
+    % Avoid using indirect assigment by moving it after detection
+      function (it was a mistake in my previous commit).
+
 2009-09-07 11:40 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/config/detect.mk
     ! fixed linking in DJGPP and OpenWatcom DOS when WATT-32 is enabled
diff --git a/harbour/bin/postinst.bat b/harbour/bin/postinst.bat
index c8b4c64b74..d0b898b337 100644
--- a/harbour/bin/postinst.bat
+++ b/harbour/bin/postinst.bat
@@ -46,6 +46,8 @@ if "%HB_SHELL%" == "nt" goto _SH_NT
    copy INSTALL    %HB_INSTALL_PREFIX% > nul
    copy TODO       %HB_INSTALL_PREFIX% > nul
 
+   if "%HB_PLATFORM%" == "win" copy bin\hb-mkimp.bat %HB_BIN_INSTALL% > nul
+
 :_NO_COPYD
 
    if "%HB_PLATFORM%" == "linux" goto _NO_PKG
@@ -72,6 +74,9 @@ if "%HB_SHELL%" == "nt" goto _SH_NT
    copy INSTALL    "%HB_INSTALL_PREFIX%\" > nul
    copy TODO       "%HB_INSTALL_PREFIX%\" > nul
 
+   if "%HB_PLATFORM%" == "win" copy bin\hb-mkimp.bat "%HB_BIN_INSTALL%\" > nul
+   if "%HB_PLATFORM%" == "wce" copy bin\hb-mkimp.bat "%HB_BIN_INSTALL%\" > nul
+
 :_NO_COPY
 
    if "%HB_PLATFORM%" == "dos" goto _NO_DLL_BIN
diff --git a/harbour/config/detect.mk b/harbour/config/detect.mk
index 5fd60b65ca..ed5d1bc187 100644
--- a/harbour/config/detect.mk
+++ b/harbour/config/detect.mk
@@ -124,11 +124,11 @@ _DET_FLT_COMP :=
 _DET_INC_DEFP := $(if $(WATT_ROOT),$(subst \,/,$(WATT_ROOT))/inc,) /usr/include
 _DET_INC_HEAD := /sys/socket.h
 
-# indirect assignment used intentionally
-export HB_LIB_WATT = $(HB_HAS_WATT:/inc=/lib)
-
 include $(TOP)$(ROOT)config/detfun.mk
 
+HB_LIB_WATT := $(subst \,/,$(HB_HAS_WATT))
+export HB_LIB_WATT := $(HB_LIB_WATT:/inc=/lib)
+
 # Finished
 
 _DET_OPT_VERB :=