69 lines
1.8 KiB
Plaintext
69 lines
1.8 KiB
Plaintext
$OpenBSD: patch-Makefile,v 1.8 2007/05/08 09:48:07 bernd Exp $
|
|
--- Makefile.orig Tue May 1 04:46:26 2007
|
|
+++ Makefile Sat May 5 09:29:24 2007
|
|
@@ -123,13 +123,13 @@ uname_P := $(shell sh -c 'uname -p 2>/dev/null || echo
|
|
|
|
# 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/
|
|
@@ -138,7 +138,7 @@ sysconfdir = /etc
|
|
else
|
|
sysconfdir = $(prefix)/etc
|
|
endif
|
|
-ETC_GITCONFIG = $(sysconfdir)/gitconfig
|
|
+ETC_GITCONFIG = $(SYSCONFDIR)/gitconfig
|
|
# DESTDIR=
|
|
|
|
# default configuration for gitweb
|
|
@@ -159,7 +159,7 @@ GITWEB_SITE_FOOTER =
|
|
|
|
export prefix bindir gitexecdir template_dir sysconfdir
|
|
|
|
-CC = gcc
|
|
+CC ?= gcc
|
|
AR = ar
|
|
TAR = tar
|
|
INSTALL = install
|
|
@@ -407,10 +407,9 @@ 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
|
|
+ BASIC_CFLAGS += -I${X11BASE}/include -I${LOCALBASE}/include
|
|
+ BASIC_LDFLAGS += -L${X11BASE}/lib -L${LOCALBASE}/lib
|
|
endif
|
|
ifeq ($(uname_S),NetBSD)
|
|
ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2)
|
|
@@ -487,7 +486,7 @@ ifndef NO_CURL
|
|
endif
|
|
|
|
ifndef NO_OPENSSL
|
|
- OPENSSL_LIBSSL = -lssl
|
|
+ OPENSSL_LIBSSL = -lssl -lcrypto
|
|
ifdef OPENSSLDIR
|
|
BASIC_CFLAGS += -I$(OPENSSLDIR)/include
|
|
OPENSSL_LINK = -L$(OPENSSLDIR)/lib $(CC_LD_DYNPATH)$(OPENSSLDIR)/lib
|
|
@@ -866,7 +865,7 @@ GIT-CFLAGS: .FORCE-GIT-CFLAGS
|
|
|
|
export NO_SVN_TESTS
|
|
|
|
-test: all test-chmtime$X
|
|
+test: test-chmtime$X
|
|
$(MAKE) -C t/ all
|
|
|
|
test-date$X: test-date.c date.o ctype.o
|