diff --git a/harbour/ChangeLog b/harbour/ChangeLog index c4c9acc415..793808a2c1 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,11 @@ 2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-02-27 12:17 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + * make_gnu.bat + + Made them accept HB_BUILD_DLL=yes. + ! Some typos. + 2009-02-27 11:51 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * bin/postinst.bat * make_gnu.bat diff --git a/harbour/make_gnu.bat b/harbour/make_gnu.bat index b187eb4a62..513c9ac17c 100644 --- a/harbour/make_gnu.bat +++ b/harbour/make_gnu.bat @@ -110,10 +110,15 @@ if not exist %HB_INC_INSTALL%\*.* md %HB_INC_INSTALL% rem It will automatically build Harbour in two passes, one for rem the .dlls and a final pass for the regular version. - if not "%HB_ARCHITECTURE%" == "win" goto _SKIP_WINDLL - if not "%1" == "--install-with-dll" goto _SKIP_WINDLL + if not "%HB_ARCHITECTURE%" == "win" goto SKIP_WIN + + set _HB_BUILD_DLL_OLD=%HB_BUILD_DLL% + set _HB_BUILD_DLL=%HB_BUILD_DLL% + if "%1" == "--install-with-dll" set _HB_BUILD_DLL=yes + if "%1" == "--install-with-dll" shift + + if not "%_HB_BUILD_DLL%" == "yes" goto SKIP_WINDLL - shift set HB_BUILD_DLL=yes set _HB_CONTRIBLIBS=%HB_CONTRIBLIBS% set _HB_CONTRIB_ADDONS=%HB_CONTRIB_ADDONS% @@ -128,6 +133,12 @@ if not exist %HB_INC_INSTALL%\*.* md %HB_INC_INSTALL% 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 + +:SKIP_WINDLL + + set HB_BUILD_DLL=%_HB_BUILD_DLL_OLD% + set _HB_BUILD_DLL= + set _HB_BUILD_DLL_OLD= goto END :SKIP_WIN