From fce2bf8842e8224822619afabff1bfcfc3546436 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Fri, 17 Aug 2007 14:50:29 +0200 Subject: [PATCH] Revert fa807fcb: 'Revert "Makefile: remove $foo when $foo.exe...' It works in msysgit, so there is no reason why we should not remove the scripted versions. Especially since some tests were failing for the sole reason that _not_ the builtin, but the script was executed. Signed-off-by: Johannes Schindelin --- Makefile | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 9669817bf4..bc8e9d2125 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # The default target of this Makefile is... -all: +all:: # Define V=1 to have a more verbose compile. # @@ -752,9 +752,12 @@ export TAR INSTALL DESTDIR SHELL_PATH ### Build rules -all: $(ALL_PROGRAMS) $(BUILT_INS) $(OTHER_PROGRAMS) +all:: $(ALL_PROGRAMS) $(BUILT_INS) $(OTHER_PROGRAMS) +ifneq (,$X) + $(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) git$X)), $(RM) '$p';) +endif -all: +all:: ifndef NO_TCLTK $(QUIET_SUBDIR0)git-gui $(QUIET_SUBDIR1) all endif @@ -982,7 +985,7 @@ endif TEST_PROGRAMS = test-chmtime$X test-genrandom$X test-date$X test-delta$X test-sha1$X test-match-trees$X test-absolute-path$X -all: $(TEST_PROGRAMS) +all:: $(TEST_PROGRAMS) # GNU make supports exporting all variables by "export" without parameters. # However, the environment gets quite big, and some programs have problems @@ -1030,6 +1033,9 @@ endif '$(DESTDIR_SQ)$(gitexecdir_SQ)/git$X'; \ fi $(foreach p,$(BUILT_INS), $(RM) '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' && ln '$(DESTDIR_SQ)$(gitexecdir_SQ)/git$X' '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' ;) +ifneq (,$X) + $(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) git$X)), $(RM) '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p';) +endif install-doc: $(MAKE) -C Documentation install