diff --git a/harbour/ChangeLog b/harbour/ChangeLog index a57fb04000..48fd2470a1 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,19 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-08-21 16:52 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * source/pp/Makefile + ! Deleted double clean rules for hbpp executable + .tds file. + Since BIN_FILE is set, it will be done in central clean rules + anyway. + This solves the recently shown up error message on 'clean' + when using certain shells (nt). It was cleaned twice and for + some reason this created a problem after switching central + rules to use $(wildcard) instead of 'if exist'. Probably + rules are merged, then evaluated at once, thus leaving + two delete commands, since when the file existed when + this evaluation took place. + 2009-08-21 16:42 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * source/vm/maindllh.c * source/vm/maindllp.c @@ -46,6 +59,7 @@ nt shell deleting the .exe (and .tds), despite the file is there and we're doing wildcard check too. Ideas are welcome. This worked a few days ago. + [DONE - hopefully] 2009-08-21 15:32 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * config/instsh.mk diff --git a/harbour/source/pp/Makefile b/harbour/source/pp/Makefile index 6d0ab2991c..12b66f009b 100644 --- a/harbour/source/pp/Makefile +++ b/harbour/source/pp/Makefile @@ -27,6 +27,7 @@ INSTALL_RULE_LIBRARIES := $(INSTALL_RULE) HB_VERHEADER := $(TOP)$(ROOT)include/hbverbld.h BIN_FILE := $(BIN_DIR)/hbpp$(BIN_EXT) + vpath hbpp$(BIN_EXT) $(BIN_DIR) # NOTE: Leave the extra empty line after the rules. @@ -49,9 +50,7 @@ install:: $(INSTALL_RULE_LIBRARIES) clean:: - $(if $(wildcard $(HB_VERHEADER)), -@$(RM) $(subst /,$(DIRSEP),$(HB_VERHEADER)),) - $(if $(wildcard $(BIN_DIR)/hbpp$(BIN_EXT)),-@$(RM) $(subst /,$(DIRSEP),$(BIN_DIR)/hbpp$(BIN_EXT)),) - $(if $(wildcard $(BIN_DIR)/hbpp.tds), -@$(RM) $(subst /,$(DIRSEP),$(BIN_DIR)/hbpp.tds),) + $(if $(wildcard $(HB_VERHEADER)), -@$(RM) $(subst /,$(DIRSEP),$(HB_VERHEADER)),) endif endif