undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] CURLDIR in Makefile

Browse Source 
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>
This commit is contained in:
Patrick Mauritz 2005-09-19 16:11:19 +02:00 committed by Junio C Hamano
parent da38641d7c
commit 6d9bbc50a3
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@ -9,6 +9,9 @@
# Define NO_CURL if you do not have curl installed. git-http-pull is not # Define NO_CURL if you do not have curl installed. git-http-pull is not
# built, and you cannot use http:// and https:// transports. # 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 NO_STRCASESTR if you don't have strcasestr.
# #
# Define PPC_SHA1 environment variable when running make to make use of # Define PPC_SHA1 environment variable when running make to make use of
@ -131,6 +134,13 @@ ifdef WITH_SEND_EMAIL
endif endif
ifndef NO_CURL 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 PROGRAMS += git-http-fetch
endif endif
@ -285,7 +295,7 @@ git-ssh-upload: rsh.o
git-ssh-pull: rsh.o fetch.o git-ssh-pull: rsh.o fetch.o
git-ssh-push: rsh.o git-ssh-push: rsh.o
git-http-fetch: LIBS += -lcurl git-http-fetch: LIBS += $(CURL_LIBCURL)
git-rev-list: LIBS += $(OPENSSL_LIBSSL) git-rev-list: LIBS += $(OPENSSL_LIBSSL)
init-db.o: init-db.c init-db.o: init-db.c