diff options
| author | Patrick Mauritz <oxygene@studentenbude.ath.cx> | 2005-09-19 16:11:19 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-09-24 11:26:22 -0700 |
| commit | 6d9bbc50a3c57394261605f10942ce3af61e5e36 (patch) | |
| tree | 8c5d1d3810f8a231fcd2d851b0e76bc9b5a5e27d /Makefile | |
| parent | da38641d7c1bd64f86bdd9e1f66fbff1cbb4f3b6 (diff) | |
| download | git-6d9bbc50a3c57394261605f10942ce3af61e5e36.tar.gz git-6d9bbc50a3c57394261605f10942ce3af61e5e36.tar.xz | |
[PATCH] CURLDIR in Makefile
Support systems that do not install curl headers and libraries
in /usr/{include,lib}.
Signed-off-by: Patrick Mauritz <oxygene@studentenbude.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 12 |
1 files changed, 11 insertions, 1 deletions
@@ -9,6 +9,9 @@ # Define NO_CURL if you do not have curl installed. git-http-pull is not # built, and you cannot use http:// and https:// transports. # +# Define CURLDIR=/foo/bar if your curl header and library files are in +# /foo/bar/include and /foo/bar/lib directories. +# # Define NO_STRCASESTR if you don't have strcasestr. # # Define PPC_SHA1 environment variable when running make to make use of @@ -131,6 +134,13 @@ ifdef WITH_SEND_EMAIL endif ifndef NO_CURL + ifdef CURLDIR + # This is still problematic -- gcc does not want -R. + CFLAGS += -I$(CURLDIR)/include + CURL_LIBCURL = -L$(CURLDIR)/lib -R$(CURLDIR)/lib -lcurl + else + CURL_LIBCURL = -lcurl + endif PROGRAMS += git-http-fetch endif @@ -285,7 +295,7 @@ git-ssh-upload: rsh.o git-ssh-pull: rsh.o fetch.o git-ssh-push: rsh.o -git-http-fetch: LIBS += -lcurl +git-http-fetch: LIBS += $(CURL_LIBCURL) git-rev-list: LIBS += $(OPENSSL_LIBSSL) init-db.o: init-db.c |