aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <junio@twinsun.com>2005-09-30 13:31:16 -0700
committerJunio C Hamano <junkio@cox.net>2005-10-01 23:19:48 -0700
commit455a7f3275d264f6e66045b92c83747ec461dda5 (patch)
tree566b08d502b5cb82e0a72d485026a6707b2a73c3 /Makefile
parent8098a178b26dc7a158d129a092a5b78da6d12b72 (diff)
downloadgit-455a7f3275d264f6e66045b92c83747ec461dda5.tar.gz
git-455a7f3275d264f6e66045b92c83747ec461dda5.tar.xz
More portability.
- The location of openssl development files got customizable. - The location of iconv development files got customizable. - Pass $TAR down to t5000 test so that the user can override with 'gmake TAR=gtar'. - Solaris 'bc' does not seem to grok "define abs()". There is no reason to use bc there -- expr would do. Signed-off-by: Junio C Hamano <junio@twinsun.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile20
1 files changed, 17 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 5648296a8..e7f3d1ffc 100644
--- a/Makefile
+++ b/Makefile
@@ -200,18 +200,32 @@ endif
ifndef NO_OPENSSL
LIB_OBJS += epoch.o
OPENSSL_LIBSSL = -lssl
+ ifdef OPENSSLDIR
+ # Again this may be problematic -- gcc does not always want -R.
+ CFLAGS += -I$(OPENSSLDIR)/include
+ OPENSSL_LINK = -L$(OPENSSLDIR)/lib -R$(OPENSSLDIR)/lib
+ else
+ OPENSSL_LINK =
+ endif
else
DEFINES += '-DNO_OPENSSL'
MOZILLA_SHA1 = 1
OPENSSL_LIBSSL =
endif
ifdef NEEDS_SSL_WITH_CRYPTO
- LIB_4_CRYPTO = -lcrypto -lssl
+ LIB_4_CRYPTO = $(OPENSSL_LINK) -lcrypto -lssl
else
- LIB_4_CRYPTO = -lcrypto
+ LIB_4_CRYPTO = $(OPENSSL_LINK) -lcrypto
endif
ifdef NEEDS_LIBICONV
- LIB_4_ICONV = -liconv
+ ifdef ICONVDIR
+ # Again this may be problematic -- gcc does not always want -R.
+ CFLAGS += -I$(ICONVDIR)/include
+ ICONV_LINK = -L$(ICONVDIR)/lib -R$(ICONVDIR)/lib
+ else
+ ICONV_LINK =
+ endif
+ LIB_4_ICONV = $(ICONV_LINK) -liconv
else
LIB_4_ICONV =
endif