46 lines
1.2 KiB
Plaintext
46 lines
1.2 KiB
Plaintext
$OpenBSD: patch-Makefile,v 1.4 2007/01/13 14:26:59 matthieu Exp $
|
|
--- Makefile.orig Mon Jan 8 04:14:44 2007
|
|
+++ Makefile Sat Jan 13 15:22:32 2007
|
|
@@ -106,13 +106,13 @@ uname_P := $(shell sh -c 'uname -p 2>/de
|
|
|
|
# CFLAGS and LDFLAGS are for the users to override from the command line.
|
|
|
|
-CFLAGS = -g -O2 -Wall
|
|
+CFLAGS ?= -g -O2 -Wall
|
|
LDFLAGS =
|
|
ALL_CFLAGS = $(CFLAGS)
|
|
ALL_LDFLAGS = $(LDFLAGS)
|
|
STRIP ?= strip
|
|
|
|
-prefix = $(HOME)
|
|
+#prefix = $(HOME)
|
|
bindir = $(prefix)/bin
|
|
gitexecdir = $(bindir)
|
|
template_dir = $(prefix)/share/git-core/templates/
|
|
@@ -137,7 +137,7 @@ GITWEB_SITE_FOOTER =
|
|
|
|
export prefix bindir gitexecdir template_dir GIT_PYTHON_DIR
|
|
|
|
-CC = gcc
|
|
+CC ?= gcc
|
|
AR = ar
|
|
TAR = tar
|
|
INSTALL = install
|
|
@@ -375,7 +375,6 @@ ifeq ($(uname_S),FreeBSD)
|
|
BASIC_LDFLAGS += -L/usr/local/lib
|
|
endif
|
|
ifeq ($(uname_S),OpenBSD)
|
|
- NO_STRCASESTR = YesPlease
|
|
NEEDS_LIBICONV = YesPlease
|
|
BASIC_CFLAGS += -I/usr/local/include
|
|
BASIC_LDFLAGS += -L/usr/local/lib
|
|
@@ -457,7 +456,7 @@ ifndef NO_CURL
|
|
endif
|
|
|
|
ifndef NO_OPENSSL
|
|
- OPENSSL_LIBSSL = -lssl
|
|
+ OPENSSL_LIBSSL = -lssl -lcrypto
|
|
ifdef OPENSSLDIR
|
|
# Again this may be problematic -- gcc does not always want -R.
|
|
BASIC_CFLAGS += -I$(OPENSSLDIR)/include
|