diff --git a/harbour/ChangeLog b/harbour/ChangeLog index b2b96a59ca..1b5ffca821 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,14 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-07-16 16:21 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * source/pp/Makefile + * config/rules.cf + * config/global.cf + + Added new internal variable HB_HOST_BIN_DIR to avoid touching + original HB_BIN_COMPILE and in turn mess up __PLATFORM__ macro + definitions in recursive runs to GNU Make. + 2009-07-16 15:56 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * config/global.cf * config/instsh.cf diff --git a/harbour/config/global.cf b/harbour/config/global.cf index e5ac776378..9b69f57c27 100644 --- a/harbour/config/global.cf +++ b/harbour/config/global.cf @@ -277,7 +277,9 @@ ifneq ($(HB_DB_DRVEXT),) endif ifeq ($(HB_BIN_COMPILE),) - HB_BIN_COMPILE := $(TOP)$(ROOT)bin/$(ARCH_COMP) + HB_HOST_BIN_DIR := $(TOP)$(ROOT)bin/$(ARCH_COMP) +else + HB_HOST_BIN_DIR := $(HB_BIN_COMPILE) endif ifeq ($(HB_INC_COMPILE),) diff --git a/harbour/config/rules.cf b/harbour/config/rules.cf index 68a4adcb97..ec96c08bb5 100644 --- a/harbour/config/rules.cf +++ b/harbour/config/rules.cf @@ -17,7 +17,7 @@ else endif # How to run Harbour -HB := $(HB_BIN_COMPILE)/harbour$(HB_HOST_BIN_EXT) +HB := $(HB_HOST_BIN_DIR)/harbour$(HB_HOST_BIN_EXT) ifeq ($(HB_GCMODE),) HB_GCMODE = 0 diff --git a/harbour/source/pp/Makefile b/harbour/source/pp/Makefile index 70ac104145..a9429a341e 100644 --- a/harbour/source/pp/Makefile +++ b/harbour/source/pp/Makefile @@ -29,7 +29,7 @@ pptable.c : $(HB_PP_RULES) $(CP) $(subst /,$(DIRSEP),$<) $@ else pptable.c : hbpp$(EXE_EXT) - $(HB_BIN_COMPILE)/hbpp$(HB_HOST_BIN_EXT) $(TOP)$(ROOT)include/hbstdgen.ch -opptable.c -q -c$(TOP)$(ROOT) -v$(HB_VERHEADER) + $(HB_HOST_BIN_DIR)/hbpp$(HB_HOST_BIN_EXT) $(TOP)$(ROOT)include/hbstdgen.ch -opptable.c -q -c$(TOP)$(ROOT) -v$(HB_VERHEADER) endif ifneq ($(HB_BIN_INSTALL),)