forked from Lainports/opnsense-ports
83 lines
2 KiB
Text
83 lines
2 KiB
Text
--- Makefile.orig 2015-07-15 20:29:34 UTC
|
|
+++ Makefile
|
|
@@ -366,8 +366,8 @@ GIT-VERSION-FILE: FORCE
|
|
|
|
# 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 = $(CPPFLAGS) $(CFLAGS)
|
|
ALL_LDFLAGS = $(LDFLAGS)
|
|
STRIP ?= strip
|
|
@@ -389,15 +389,15 @@ STRIP ?= strip
|
|
prefix = $(HOME)
|
|
bindir_relative = bin
|
|
bindir = $(prefix)/$(bindir_relative)
|
|
-mandir = $(prefix)/share/man
|
|
-infodir = $(prefix)/share/info
|
|
+mandir = $(prefix)/man
|
|
+infodir = $(prefix)/info
|
|
gitexecdir = libexec/git-core
|
|
mergetoolsdir = $(gitexecdir)/mergetools
|
|
sharedir = $(prefix)/share
|
|
-gitwebdir = $(sharedir)/gitweb
|
|
+gitwebdir = $(sharedir)/examples/git/gitweb
|
|
localedir = $(sharedir)/locale
|
|
template_dir = share/git-core/templates
|
|
-htmldir = $(prefix)/share/doc/git-doc
|
|
+htmldir = $(prefix)/share/doc/git
|
|
ETC_GITCONFIG = $(sysconfdir)/gitconfig
|
|
ETC_GITATTRIBUTES = $(sysconfdir)/gitattributes
|
|
lib = lib
|
|
@@ -410,21 +410,21 @@ htmldir_relative = $(patsubst $(prefix)/
|
|
|
|
export prefix bindir sharedir sysconfdir gitwebdir localedir
|
|
|
|
-CC = cc
|
|
-AR = ar
|
|
-RM = rm -f
|
|
-DIFF = diff
|
|
-TAR = tar
|
|
-FIND = find
|
|
-INSTALL = install
|
|
-RPMBUILD = rpmbuild
|
|
-TCL_PATH = tclsh
|
|
-TCLTK_PATH = wish
|
|
-XGETTEXT = xgettext
|
|
-MSGFMT = msgfmt
|
|
-PTHREAD_LIBS = -lpthread
|
|
-PTHREAD_CFLAGS =
|
|
-GCOV = gcov
|
|
+CC ?= cc
|
|
+AR ?= ar
|
|
+RM ?= rm -f
|
|
+DIFF ?= diff
|
|
+TAR ?= tar
|
|
+FIND ?= find
|
|
+INSTALL ?= install
|
|
+RPMBUILD ?= rpmbuild
|
|
+TCL_PATH ?= tclsh
|
|
+TCLTK_PATH ?= wish
|
|
+XGETTEXT ?= xgettext
|
|
+MSGFMT ?= msgfmt
|
|
+PTHREAD_LIBS ?= -lpthread
|
|
+PTHREAD_CFLAGS ?=
|
|
+GCOV ?= gcov
|
|
|
|
export TCL_PATH TCLTK_PATH
|
|
|
|
@@ -1090,9 +1090,9 @@ EXTLIBS += -lz
|
|
|
|
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
|