summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-08-27 05:47:27 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-08-27 05:47:27 (GMT)
commit0f583175317a1c5c57b56c87856fbe46c3f3c296 (patch)
tree743751d750cb7355c02dd2aa7f53a655ba6fd11c /Makefile
parentb033b4e48195ef5974b7255f30de2cd7f67868b8 (diff)
parentaba2da13391d2adc72c0a2805e7196db2c803753 (diff)
downloadgit-0f583175317a1c5c57b56c87856fbe46c3f3c296.zip
git-0f583175317a1c5c57b56c87856fbe46c3f3c296.tar.gz
git-0f583175317a1c5c57b56c87856fbe46c3f3c296.tar.bz2
Merge master branch changes into release candidate branch.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index bc2f389..57d4f11 100644
--- a/Makefile
+++ b/Makefile
@@ -69,7 +69,6 @@ SCRIPTS=git git-apply-patch-script git-merge-one-file-script git-prune-script \
git-request-pull-script git-bisect-script
SCRIPTS += git-count-objects-script
-# SCRIPTS += git-send-email-script
SCRIPTS += git-revert-script
SCRIPTS += git-octopus-script
@@ -87,6 +86,10 @@ PROG= git-update-cache git-diff-files git-init-db git-write-tree \
git-show-index git-daemon git-var git-peek-remote git-show-branch \
git-update-server-info git-show-rev-cache git-build-rev-cache
+ifdef WITH_SEND_EMAIL
+SCRIPTS += git-send-email-script
+endif
+
ifndef NO_CURL
PROG+= git-http-pull
endif