69 lines
1.5 KiB
Text
69 lines
1.5 KiB
Text
--- Makefile.orig 2008-12-25 00:33:25.000000000 -0500
|
|
+++ Makefile 2009-01-14 09:37:39.152324285 -0500
|
|
@@ -170,8 +170,8 @@
|
|
|
|
# CFLAGS and LDFLAGS are for the users to override from the command line.
|
|
|
|
-CFLAGS = -g -O2 -Wall
|
|
-LDFLAGS =
|
|
+CFLAGS ?= -g -O2 -Wall
|
|
+LDFLAGS ?=
|
|
ALL_CFLAGS = $(CFLAGS)
|
|
ALL_LDFLAGS = $(LDFLAGS)
|
|
STRIP ?= strip
|
|
@@ -188,12 +188,12 @@
|
|
|
|
prefix = $(HOME)
|
|
bindir = $(prefix)/bin
|
|
-mandir = $(prefix)/share/man
|
|
-infodir = $(prefix)/share/info
|
|
+mandir = $(prefix)/man
|
|
+infodir = $(prefix)/info
|
|
gitexecdir = $(prefix)/libexec/git-core
|
|
sharedir = $(prefix)/share
|
|
template_dir = $(sharedir)/git-core/templates
|
|
-htmldir=$(sharedir)/doc/git-doc
|
|
+htmldir=$(sharedir)/doc/git
|
|
ifeq ($(prefix),/usr)
|
|
sysconfdir = /etc
|
|
else
|
|
@@ -223,16 +223,16 @@
|
|
|
|
export prefix bindir sharedir htmldir sysconfdir
|
|
|
|
-CC = gcc
|
|
-AR = ar
|
|
-RM = rm -f
|
|
-TAR = tar
|
|
-FIND = find
|
|
-INSTALL = install
|
|
-RPMBUILD = rpmbuild
|
|
-TCL_PATH = tclsh
|
|
-TCLTK_PATH = wish
|
|
-PTHREAD_LIBS = -lpthread
|
|
+CC ?= gcc
|
|
+AR ?= ar
|
|
+RM ?= rm -f
|
|
+TAR ?= tar
|
|
+FIND ?= find
|
|
+INSTALL ?= install
|
|
+RPMBUILD ?= rpmbuild
|
|
+TCL_PATH ?= tclsh
|
|
+TCLTK_PATH ?= wish
|
|
+PTHREAD_LIBS ?= -lpthread
|
|
|
|
export TCL_PATH TCLTK_PATH
|
|
|
|
@@ -865,9 +865,9 @@
|
|
endif
|
|
ifndef NO_OPENSSL
|
|
OPENSSL_LIBSSL = -lssl
|
|
- ifdef OPENSSLDIR
|
|
- BASIC_CFLAGS += -I$(OPENSSLDIR)/include
|
|
- OPENSSL_LINK = -L$(OPENSSLDIR)/$(lib) $(CC_LD_DYNPATH)$(OPENSSLDIR)/$(lib)
|
|
+ ifdef OPENSSLBASE
|
|
+ BASIC_CFLAGS += -I$(OPENSSLBASE)/include
|
|
+ OPENSSL_LINK = -L$(OPENSSLBASE)/$(lib) $(CC_LD_DYNPATH)$(OPENSSLBASE)/$(lib)
|
|
else
|
|
OPENSSL_LINK =
|
|
endif
|