From 025e475e4b24f59608d25f73867dd308afe20888 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 19 Sep 2009 11:58:24 +0000 Subject: [PATCH] 2009-09-19 13:53 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * config/global.mk ! Typo. * utils/hbmk2/hbmk2.prg ! Fixed BSD CURSES lib name. --- harbour/ChangeLog | 7 +++++++ harbour/config/global.mk | 2 +- harbour/utils/hbmk2/hbmk2.prg | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index b8b38da22c..07503b91ac 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,13 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-09-19 13:53 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * config/global.mk + ! Typo. + + * utils/hbmk2/hbmk2.prg + ! Fixed BSD CURSES lib name. + 2009-09-19 13:52 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/bin/hb-func.sh ! fixed few problems introduced by macro name modifications and removed diff --git a/harbour/config/global.mk b/harbour/config/global.mk index b3c15d3ecb..70f204dfa0 100644 --- a/harbour/config/global.mk +++ b/harbour/config/global.mk @@ -1218,7 +1218,7 @@ ifneq ($(HB_INSTALL_PREFIX),) endif # Use 'lib64' instead of 'lib' for 64-bit targets ifneq ($(filter $(HB_CPU),x86_64),) - LIBPOSTFIX += 64$(LIBPOSTFIX) + LIBPOSTFIX := 64$(LIBPOSTFIX) endif endif diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 5cfa13426e..e1372d050c 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -2240,7 +2240,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause ) IF IsGTRequested( hbmk, "gtcrs" ) /* TOFIX: Sometimes 'ncur194' is needed. */ - AAdd( l_aLIBSYS, iif( hbmk[ _HBMK_cPLAT ] == "sunos", "curses", "ncurses" ) ) + AAdd( l_aLIBSYS, iif( hbmk[ _HBMK_cPLAT ] $ "sunos|bsd", "curses", "ncurses" ) ) ENDIF IF IsGTRequested( hbmk, "gtsln" ) AAdd( l_aLIBSYS, "slang" )