fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2009-09-07 12:03 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* 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).
This commit is contained in:
Viktor Szakats
2009-09-07 10:03:48 +00:00
parent ceed1ece15
commit 1674d71a46
3 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
harbour/ChangeLog
View File

@@ -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

5
harbour/bin/postinst.bat
View File

@@ -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

6
harbour/config/detect.mk
View File

@@ -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 :=