diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 6108a1d567..f1431e81e9 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,14 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2007-11-27 09:33 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * contrib/mtpl_b32.mak + * contrib/mtpl_vc.mak + + Added optional HB_CC_DIRNAME to control (and override) + where the final target files will be created inside + obj/lib/bin dirs. + Marek pls report if this solved anything for you. + 2007-11-27 01:12 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * make_b32.mak ! Removed -l flag from .dll creation to be in sync with the diff --git a/harbour/contrib/mtpl_b32.mak b/harbour/contrib/mtpl_b32.mak index 28e8799bff..5c08a59051 100644 --- a/harbour/contrib/mtpl_b32.mak +++ b/harbour/contrib/mtpl_b32.mak @@ -73,9 +73,13 @@ HB_LIB_INSTALL = $(HB_INSTALL_PREFIX)\lib # Directory macros. These should never have to change. #********************************************************** -OBJ_DIR = $(HB_ROOT)\obj\$(_HB_CC_NAME) -LIB_DIR = $(HB_ROOT)\lib\$(_HB_CC_NAME) -BIN_DIR = $(HB_ROOT)\bin\$(_HB_CC_NAME) +!ifndef HB_CC_DIRNAME +HB_CC_DIRNAME = $(_HB_CC_NAME) +!endif + +OBJ_DIR = $(HB_ROOT)\obj\$(HB_CC_DIRNAME) +LIB_DIR = $(HB_ROOT)\lib\$(HB_CC_DIRNAME) +BIN_DIR = $(HB_ROOT)\bin\$(HB_CC_DIRNAME) INCLUDE_DIR = $(HB_ROOT)\include diff --git a/harbour/contrib/mtpl_vc.mak b/harbour/contrib/mtpl_vc.mak index 14123e1946..b4304502ff 100644 --- a/harbour/contrib/mtpl_vc.mak +++ b/harbour/contrib/mtpl_vc.mak @@ -70,9 +70,13 @@ HB_LIB_INSTALL = $(HB_INSTALL_PREFIX)\lib # Directory macros. These should never have to change. #********************************************************** -OBJ_DIR = $(HB_ROOT)\obj\$(_HB_CC_NAME) -LIB_DIR = $(HB_ROOT)\lib\$(_HB_CC_NAME) -BIN_DIR = $(HB_ROOT)\bin\$(_HB_CC_NAME) +!ifndef HB_CC_DIRNAME +HB_CC_DIRNAME = $(_HB_CC_NAME) +!endif + +OBJ_DIR = $(HB_ROOT)\obj\$(HB_CC_DIRNAME) +LIB_DIR = $(HB_ROOT)\lib\$(HB_CC_DIRNAME) +BIN_DIR = $(HB_ROOT)\bin\$(HB_CC_DIRNAME) INCLUDE_DIR = $(HB_ROOT)\include