aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2012-06-02 15:03:08 -0400
committerJunio C Hamano <gitster@pobox.com>2012-06-03 13:11:54 -0700
commit745c7c8e6252ba41430a1442e1fa8da2ec40e9c2 (patch)
treeb0dc93ef1c6e2da4f08a567adffee79cb4007852 /Makefile
parent42dcbb738b47ab7e2b265ed981c9a4a7bda92f97 (diff)
downloadgit-745c7c8e6252ba41430a1442e1fa8da2ec40e9c2.tar.gz
git-745c7c8e6252ba41430a1442e1fa8da2ec40e9c2.tar.xz
http: get default user-agent from git_user_agent
This means we will respect the GIT_USER_AGENT build-time configuration and run-time environment variable. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 1 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index e6e65cac4..62de0b42b 100644
--- a/Makefile
+++ b/Makefile
@@ -2104,7 +2104,7 @@ configure: configure.ac
$(RM) $<+
# These can record GIT_VERSION
-version.o git.spec http.o \
+version.o git.spec \
$(patsubst %.sh,%,$(SCRIPT_SH)) \
$(patsubst %.perl,%,$(SCRIPT_PERL)) \
: GIT-VERSION-FILE
@@ -2274,9 +2274,6 @@ attr.sp attr.s attr.o: EXTRA_CPPFLAGS = \
gettext.sp gettext.s gettext.o: EXTRA_CPPFLAGS = \
-DGIT_LOCALE_PATH='"$(localedir_SQ)"'
-http.sp http.s http.o: EXTRA_CPPFLAGS = \
- -DGIT_HTTP_USER_AGENT='"git/$(GIT_VERSION)"'
-
ifdef NO_EXPAT
http-walker.sp http-walker.s http-walker.o: EXTRA_CPPFLAGS = -DNO_EXPAT
endif