diff --git a/harbour/ChangeLog b/harbour/ChangeLog index e019ed98f8..bbfd3c56de 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,12 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2008-09-09 11:50 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * contrib/mtpl_b32.mak + * contrib/mtpl_gcc.mak + * contrib/mtpl_vc.mak + ! Some more fine tuning. + 2008-09-09 11:47 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/source/vm/asort.c ! fixed GPF when user sort code block reduces the size of sorted array diff --git a/harbour/contrib/mtpl_b32.mak b/harbour/contrib/mtpl_b32.mak index 8179c302f8..bf47e6d119 100644 --- a/harbour/contrib/mtpl_b32.mak +++ b/harbour/contrib/mtpl_b32.mak @@ -81,8 +81,7 @@ HB_LIB_INSTALL = $(HB_INSTALL_PREFIX)\lib HB_CC_DIRNAME = $(_HB_CC_NAME) !endif -OBJ_ROOT = obj -OBJ_DIR = $(OBJ_ROOT)\$(HB_CC_DIRNAME)\\ +OBJ_DIR = obj\$(HB_CC_DIRNAME)\\ LIB_DIR = $(HB_ROOT)\lib\$(HB_CC_DIRNAME)\\ BIN_DIR = $(HB_ROOT)\bin\$(HB_CC_DIRNAME)\\ @@ -210,7 +209,6 @@ doClean: @if exist _hbdeloa.bat $(DEL) _hbdeloa.bat > nul @if exist _hbdeloo.bat $(DEL) _hbdeloo.bat > nul @if exist "$(OBJ_DIR)" rd "$(OBJ_DIR)" > nul 2> nul - @if exist "$(OBJ_ROOT)" rd "$(OBJ_ROOT)" > nul 2> nul !if "$(HB_INSTALL_PREFIX)" == "$(HB_ROOT)" @if exist $(HB_LIB_INSTALL)\$(LIBNAME)$(LIBEXT) $(DEL) $(HB_LIB_INSTALL)\$(LIBNAME)$(LIBEXT) > nul diff --git a/harbour/contrib/mtpl_gcc.mak b/harbour/contrib/mtpl_gcc.mak index 7611c2aa6a..c4e9a60e4c 100644 --- a/harbour/contrib/mtpl_gcc.mak +++ b/harbour/contrib/mtpl_gcc.mak @@ -80,8 +80,7 @@ ifndef HB_CC_DIRNAME HB_CC_DIRNAME = $(_HB_CC_NAME) endif -OBJ_ROOT = obj -OBJ_DIR = $(OBJ_ROOT)/$(HB_CC_DIRNAME)/ +OBJ_DIR = obj/$(HB_CC_DIRNAME)/ LIB_DIR = $(HB_ROOT)/lib/$(HB_CC_DIRNAME)/ BIN_DIR = $(HB_ROOT)/bin/$(HB_CC_DIRNAME)/ diff --git a/harbour/contrib/mtpl_vc.mak b/harbour/contrib/mtpl_vc.mak index 4a5a8d15ff..1f6fe85fa2 100644 --- a/harbour/contrib/mtpl_vc.mak +++ b/harbour/contrib/mtpl_vc.mak @@ -78,8 +78,7 @@ HB_LIB_INSTALL = $(HB_INSTALL_PREFIX)\lib HB_CC_DIRNAME = $(_HB_CC_NAME) !endif -OBJ_ROOT = obj -OBJ_DIR = $(OBJ_ROOT)\$(HB_CC_DIRNAME)\\ +OBJ_DIR = obj\$(HB_CC_DIRNAME)\\ LIB_DIR = $(HB_ROOT)\lib\$(HB_CC_DIRNAME)\\ BIN_DIR = $(HB_ROOT)\bin\$(HB_CC_DIRNAME)\\ @@ -199,7 +198,6 @@ doClean: @if exist _hbdeloa.bat $(DEL) _hbdeloa.bat > nul @if exist _hbdeloo.bat $(DEL) _hbdeloo.bat > nul @if exist "$(OBJ_DIR)" rd "$(OBJ_DIR)" > nul 2> nul - @if exist "$(OBJ_ROOT)" rd "$(OBJ_ROOT)" > nul 2> nul !if "$(HB_INSTALL_PREFIX)" == "$(HB_ROOT)" @if exist $(HB_LIB_INSTALL)\$(LIBNAME)$(LIBEXT) $(DEL) $(HB_LIB_INSTALL)\$(LIBNAME)$(LIBEXT) > nul