summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-02-14 16:06:24 -0800
committerJunio C Hamano <gitster@pobox.com>2013-02-14 16:06:24 -0800
commitf5af28b8e9db6617bd991c176adc3fe820091e7f (patch)
treef2b31eaddb4706e1e99f72666dd0c8a23b431b10 /Makefile
parentb1bcb973af0c4d9aceffad43104bb2f4d406dd3b (diff)
parent61564ca5bf29bb8039b865514a7593fc7b6c5440 (diff)
downloadgit-f5af28b8e9db6617bd991c176adc3fe820091e7f.tar.gz
Merge branch 'mk/make-rm-depdirs-could-be-empty'
"make COMPUTE_HEADER_DEPENDENCIES=no clean" would try to run "rm -rf $(dep_dirs)" with an empty dep_dir, but some implementations of "rm -rf" barf on an empty argument list. * mk/make-rm-depdirs-could-be-empty: Makefile: don't run "rm" without any files
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 951dc7d2d7..ba8e243425 100644
--- a/Makefile
+++ b/Makefile
@@ -2449,8 +2449,7 @@ clean: profile-clean
builtin/*.o $(LIB_FILE) $(XDIFF_LIB) $(VCSSVN_LIB)
$(RM) $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) git$X
$(RM) $(TEST_PROGRAMS)
- $(RM) -r bin-wrappers
- $(RM) -r $(dep_dirs)
+ $(RM) -r bin-wrappers $(dep_dirs)
$(RM) -r po/build/
$(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h $(ETAGS_TARGET) tags cscope*
$(RM) -r $(GIT_TARNAME) .doc-tmp-dir