95 lines
2.3 KiB
Plaintext
95 lines
2.3 KiB
Plaintext
--- Makefile.orig Thu Apr 1 06:29:23 2010
|
|
+++ Makefile Fri Apr 2 11:36:32 2010
|
|
@@ -234,7 +234,7 @@ endif
|
|
|
|
# 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)
|
|
@@ -252,22 +252,16 @@ STRIP ?= strip
|
|
# runtime figures out where they are based on the path to the executable.
|
|
# This can help installing the suite in a relocatable way.
|
|
|
|
-prefix = $(HOME)
|
|
+#prefix = $(HOME)
|
|
bindir_relative = bin
|
|
bindir = $(prefix)/$(bindir_relative)
|
|
-mandir = share/man
|
|
+mandir = man
|
|
infodir = share/info
|
|
-gitexecdir = libexec/git-core
|
|
+gitexecdir = libexec/git
|
|
sharedir = $(prefix)/share
|
|
template_dir = share/git-core/templates
|
|
htmldir = share/doc/git-doc
|
|
-ifeq ($(prefix),/usr)
|
|
-sysconfdir = /etc
|
|
-ETC_GITCONFIG = $(sysconfdir)/gitconfig
|
|
-else
|
|
-sysconfdir = $(prefix)/etc
|
|
-ETC_GITCONFIG = etc/gitconfig
|
|
-endif
|
|
+ETC_GITCONFIG = $(SYSCONFDIR)/gitconfig
|
|
lib = lib
|
|
# DESTDIR=
|
|
pathsep = :
|
|
@@ -277,16 +271,16 @@ JSMIN =
|
|
|
|
export prefix bindir sharedir sysconfdir
|
|
|
|
-CC = gcc
|
|
+CC ?= gcc
|
|
AR = ar
|
|
RM = rm -f
|
|
TAR = tar
|
|
FIND = find
|
|
INSTALL = install
|
|
RPMBUILD = rpmbuild
|
|
-TCL_PATH = tclsh
|
|
-TCLTK_PATH = wish
|
|
-PTHREAD_LIBS = -lpthread
|
|
+TCL_PATH ?= tclsh
|
|
+TCLTK_PATH ?= wish
|
|
+PTHREAD_LIBS = -pthread
|
|
|
|
export TCL_PATH TCLTK_PATH
|
|
|
|
@@ -833,12 +827,13 @@ ifeq ($(uname_S),FreeBSD)
|
|
endif
|
|
endif
|
|
ifeq ($(uname_S),OpenBSD)
|
|
- NO_STRCASESTR = YesPlease
|
|
NO_MEMMEM = YesPlease
|
|
USE_ST_TIMESPEC = 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
|
|
+ NO_PTHREADS = YesPlease
|
|
+ NO_PYTHON = YesPlease
|
|
endif
|
|
ifeq ($(uname_S),NetBSD)
|
|
ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2)
|
|
@@ -1110,7 +1105,7 @@ ifndef NO_POSIX_ONLY_PROGRAMS
|
|
PROGRAMS += git-daemon$X
|
|
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)
|
|
@@ -1753,7 +1748,7 @@ bin-wrappers/%: wrap-for-bin.sh
|
|
|
|
export NO_SVN_TESTS
|
|
|
|
-test: all
|
|
+test:
|
|
$(MAKE) -C t/ all
|
|
|
|
test-ctype$X: ctype.o
|