From 8acc79d48e7114f751d8d8a7a0831923158de13e Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 27 Feb 2009 10:52:05 +0000 Subject: [PATCH] 2009-02-27 11:51 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * bin/postinst.bat * make_gnu.bat * config/win/global.cf * Renamed HB_DLL to HB_BUILD_DLL, which makes this GNU make setting compatible with old non-GNU make. --- harbour/ChangeLog | 7 +++++++ harbour/bin/postinst.bat | 2 +- harbour/config/win/global.cf | 2 +- harbour/make_gnu.bat | 6 +++--- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 6273ad6aac..c4c9acc415 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,13 @@ 2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-02-27 11:51 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + * bin/postinst.bat + * make_gnu.bat + * config/win/global.cf + * Renamed HB_DLL to HB_BUILD_DLL, which makes this GNU make + setting compatible with old non-GNU make. + 2009-02-27 10:44 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * INSTALL * make_gnu.bat diff --git a/harbour/bin/postinst.bat b/harbour/bin/postinst.bat index 577c835e21..ab10d148b0 100644 --- a/harbour/bin/postinst.bat +++ b/harbour/bin/postinst.bat @@ -27,7 +27,7 @@ goto inst_%HB_ARCHITECTURE% rem Windows post install part if not "%OS%" == "Windows_NT" goto end -if "%HB_DLL%" == "yes" call %~dp0hb-mkdyn.bat +if "%HB_BUILD_DLL%" == "yes" call %~dp0hb-mkdyn.bat set _HB_BIN_INSTALL=%HB_BIN_INSTALL% if not "%HB_BIN_COMPILE%" == "" set HB_BIN_INSTALL=%HB_BIN_COMPILE% diff --git a/harbour/config/win/global.cf b/harbour/config/win/global.cf index 1c3e49903e..31e1248a5c 100644 --- a/harbour/config/win/global.cf +++ b/harbour/config/win/global.cf @@ -18,7 +18,7 @@ HB_GT_LIST=\ # verify if GT drivers exist HB_GT_LIBS := $(foreach gt, $(HB_GT_LIST), $(if $(wildcard $(TOP)$(ROOT)source/rtl/$(gt)),$(gt),)) -ifeq ($(HB_DLL),yes) +ifeq ($(HB_BUILD_DLL),yes) HB_CDYNLIB=-DHB_DYNLIB endif diff --git a/harbour/make_gnu.bat b/harbour/make_gnu.bat index bd1ff3afba..b187eb4a62 100644 --- a/harbour/make_gnu.bat +++ b/harbour/make_gnu.bat @@ -106,7 +106,7 @@ if not exist %HB_INC_INSTALL%\*.* md %HB_INC_INSTALL% rem Start the GNU make system rem --------------------------------------------------------------- - rem Special build mode when HB_DLL=yes on Windows platform. + rem Special build mode when HB_BUILD_DLL=yes on Windows platform. rem It will automatically build Harbour in two passes, one for rem the .dlls and a final pass for the regular version. @@ -114,14 +114,14 @@ if not exist %HB_INC_INSTALL%\*.* md %HB_INC_INSTALL% if not "%1" == "--install-with-dll" goto _SKIP_WINDLL shift - set HB_DLL=yes + set HB_BUILD_DLL=yes set _HB_CONTRIBLIBS=%HB_CONTRIBLIBS% set _HB_CONTRIB_ADDONS=%HB_CONTRIB_ADDONS% set HB_CONTRIBLIBS=no set HB_CONTRIB_ADDONS= make clean %HB_USER_MAKEFLAGS% %1 %2 %3 %4 %5 %6 %7 %8 %9 make install %HB_USER_MAKEFLAGS% %1 %2 %3 %4 %5 %6 %7 %8 %9 - set HB_DLL= + set HB_BUILD_DLL= set HB_CONTRIBLIBS=%_HB_CONTRIBLIBS% set HB_CONTRIB_ADDONS=%_HB_CONTRIB_ADDONS% set _HB_CONTRIBLIBS=