ports/devel/git/files/patch-Makefile
Wesley Shields bfcb4cb85d - Update to 1.6.0.3
- Add options to support:
  - P4 support (on) [1]
  - CVS support (on) [1]
  - HTML documentation (off) [2]

[1]: Requested privately by multiple people.

PR:		ports/127754 [2]
Submitted by:	Ashish Shukla <wahjava@gmail.com> [2]
2008-10-26 01:04:36 +00:00

67 lines
1.5 KiB
Text

--- ./Makefile.orig 2008-10-22 00:19:18.000000000 -0400
+++ ./Makefile 2008-10-24 10:06:40.855506700 -0400
@@ -164,8 +164,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
@@ -182,12 +182,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
@@ -217,15 +217,15 @@
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
+CC ?= gcc
+AR ?= ar
+RM ?= rm -f
+TAR ?= tar
+FIND ?= find
+INSTALL ?= install
+RPMBUILD ?= rpmbuild
+TCL_PATH ?= tclsh
+TCLTK_PATH ?= wish
export TCL_PATH TCLTK_PATH
@@ -833,9 +833,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