fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2009-08-21 16:52 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* 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.
This commit is contained in:
Viktor Szakats
2009-08-21 14:53:34 +00:00
parent 0a002a156d
commit e7951e0839
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
harbour/ChangeLog
View File

@@ -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

5
harbour/source/pp/Makefile
View File

@@ -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