@matheusbsbs / matheus-bagliano / commits / 6d9bbc50a3
Fork 0

[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>

Patrick Mauritz committed Sep 19, 2005 at 16:11 UTC 6d9bbc50a3c57394261605f10942ce3af61e5e36
1 file changed +11 -1
Makefile
+11 -1
@@ -9,6 +9,9 @@
9 # Define NO_CURL if you do not have curl installed. git-http-pull is not
10 # built, and you cannot use http:// and https:// transports.
11 #
12 +# Define CURLDIR=/foo/bar if your curl header and library files are in
13 +# /foo/bar/include and /foo/bar/lib directories.
14 +#
15 # Define NO_STRCASESTR if you don't have strcasestr.
16 #
17 # Define PPC_SHA1 environment variable when running make to make use of
@@ -131,6 +134,13 @@ ifdef WITH_SEND_EMAIL
134 endif
135
136 ifndef NO_CURL
137 + ifdef CURLDIR
138 + # This is still problematic -- gcc does not want -R.
139 + CFLAGS += -I$(CURLDIR)/include
140 + CURL_LIBCURL = -L$(CURLDIR)/lib -R$(CURLDIR)/lib -lcurl
141 + else
142 + CURL_LIBCURL = -lcurl
143 + endif
144 PROGRAMS += git-http-fetch
145 endif
146
@@ -285,7 +295,7 @@ git-ssh-upload: rsh.o
295 git-ssh-pull: rsh.o fetch.o
296 git-ssh-push: rsh.o
297
288 -git-http-fetch: LIBS += -lcurl
298 +git-http-fetch: LIBS += $(CURL_LIBCURL)
299 git-rev-list: LIBS += $(OPENSSL_LIBSSL)
300
301 init-db.o: init-db.c