From: Robert Schiele <rschiele@gmail.com>
To: git@vger.kernel.org
Subject: Re: [PATCH] zlib in custom location
Date: Fri, 27 Jul 2007 08:14:56 +0200 [thread overview]
Message-ID: <20070727061456.GD30038@schiele.dyndns.org> (raw)
In-Reply-To: <20070727054251.GC30038@schiele.dyndns.org>
[-- Attachment #1: Type: text/plain, Size: 2681 bytes --]
On Fri, Jul 27, 2007 at 07:42:51AM +0200, Robert Schiele wrote:
> Hi,
>
> I have some systems with zlib in a custom location and thus did the following
> change to support a variable ZLIBDIR like it does already exist for
> OPENSSLDIR. Would be great to see this in the main tree.
Just to follow up this change I have another one:
Since some Linux archs use different names for the library directory than
"lib" (like "lib64") I made this a config variable as well. Currently this is
only an issue if you use custom directories for libraries used by git.
commit a1cffe56cc9092443cd8bd03b18eb7e222528e35
Author: Robert Schiele <rschiele@gmail.com>
Date: Thu Jul 26 23:08:47 2007 -0700
- make the name of the library directory a config option
diff --git a/Makefile b/Makefile
index 0179339..64c0a59 100644
--- a/Makefile
+++ b/Makefile
@@ -151,6 +151,7 @@ sysconfdir = /etc
else
sysconfdir = $(prefix)/etc
endif
+lib = lib
ETC_GITCONFIG = $(sysconfdir)/gitconfig
# DESTDIR=
@@ -170,7 +171,7 @@ GITWEB_FAVICON = git-favicon.png
GITWEB_SITE_HEADER =
GITWEB_SITE_FOOTER =
-export prefix bindir gitexecdir sharedir template_dir sysconfdir
+export prefix bindir gitexecdir sharedir template_dir sysconfdir lib
CC = gcc
AR = ar
@@ -499,9 +500,9 @@ endif
ifndef NO_CURL
ifdef CURLDIR
- # Try "-Wl,-rpath=$(CURLDIR)/lib" in such a case.
+ # Try "-Wl,-rpath=$(CURLDIR)/$(lib)" in such a case.
BASIC_CFLAGS += -I$(CURLDIR)/include
- CURL_LIBCURL = -L$(CURLDIR)/lib $(CC_LD_DYNPATH)$(CURLDIR)/lib -lcurl
+ CURL_LIBCURL = -L$(CURLDIR)/$(lib) $(CC_LD_DYNPATH)$(CURLDIR)/$(lib) -lcurl
else
CURL_LIBCURL = -lcurl
endif
@@ -519,7 +520,7 @@ endif
ifdef ZLIBDIR
BASIC_CFLAGS += -I$(ZLIBDIR)/include
- EXTLIBS += -L$(ZLIBDIR)/lib $(CC_LD_DYNPATH)$(ZLIBDIR)/lib
+ EXTLIBS += -L$(ZLIBDIR)/$(lib) $(CC_LD_DYNPATH)$(ZLIBDIR)/$(lib)
endif
EXTLIBS += -lz
@@ -527,7 +528,7 @@ ifndef NO_OPENSSL
OPENSSL_LIBSSL = -lssl
ifdef OPENSSLDIR
BASIC_CFLAGS += -I$(OPENSSLDIR)/include
- OPENSSL_LINK = -L$(OPENSSLDIR)/lib $(CC_LD_DYNPATH)$(OPENSSLDIR)/lib
+ OPENSSL_LINK = -L$(OPENSSLDIR)/$(lib) $(CC_LD_DYNPATH)$(OPENSSLDIR)/$(lib)
else
OPENSSL_LINK =
endif
@@ -544,7 +545,7 @@ endif
ifdef NEEDS_LIBICONV
ifdef ICONVDIR
BASIC_CFLAGS += -I$(ICONVDIR)/include
- ICONV_LINK = -L$(ICONVDIR)/lib $(CC_LD_DYNPATH)$(ICONVDIR)/lib
+ ICONV_LINK = -L$(ICONVDIR)/$(lib) $(CC_LD_DYNPATH)$(ICONVDIR)/$(lib)
else
ICONV_LINK =
endif
Robert
--
Robert Schiele
Dipl.-Wirtsch.informatiker mailto:rschiele@gmail.com
"Quidquid latine dictum sit, altum sonatur."
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
prev parent reply other threads:[~2007-07-27 6:15 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-07-27 5:42 [PATCH] zlib in custom location Robert Schiele
2007-07-27 6:14 ` Robert Schiele [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070727061456.GD30038@schiele.dyndns.org \
--to=rschiele@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).