76 lines
1.8 KiB
Plaintext
76 lines
1.8 KiB
Plaintext
$OpenBSD: patch-Makefile,v 1.10 2007/07/12 18:26:04 bernd Exp $
|
|
--- Makefile.orig Sat Jun 16 17:31:24 2007
|
|
+++ Makefile Sun Jun 17 19:42:08 2007
|
|
@@ -137,13 +137,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)
|
|
sharedir = $(prefix)/share/
|
|
@@ -153,7 +153,7 @@ sysconfdir = /etc
|
|
else
|
|
sysconfdir = $(prefix)/etc
|
|
endif
|
|
-ETC_GITCONFIG = $(sysconfdir)/gitconfig
|
|
+ETC_GITCONFIG = $(SYSCONFDIR)/gitconfig
|
|
# DESTDIR=
|
|
|
|
# default configuration for gitweb
|
|
@@ -174,13 +174,13 @@ GITWEB_SITE_FOOTER =
|
|
|
|
export prefix bindir gitexecdir sharedir template_dir sysconfdir
|
|
|
|
-CC = gcc
|
|
+CC ?= gcc
|
|
AR = ar
|
|
TAR = tar
|
|
INSTALL = install
|
|
RPMBUILD = rpmbuild
|
|
TCL_PATH = tclsh
|
|
-TCLTK_PATH = wish
|
|
+TCLTK_PATH ?= wish
|
|
|
|
export TCL_PATH TCLTK_PATH
|
|
|
|
@@ -451,10 +451,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)
|
|
@@ -531,7 +530,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
|
|
@@ -962,7 +961,7 @@ all:: $(TEST_PROGRAMS)
|
|
|
|
export NO_SVN_TESTS
|
|
|
|
-test: all
|
|
+test:
|
|
$(MAKE) -C t/ all
|
|
|
|
test-date$X: test-date.c date.o ctype.o
|