Re: [PATCH] contrib/svn-fe: fix Makefile
- From
Torsten Bögershausen <tboegi@web.de>
- Date
- Aug 26, 2014, 09:31 UTC
- Message-ID
- <53FC5404.7050403@web.de>
- In-Reply-To
- <1409057062-72857-1-git-send-email-satori@yandex-team.ru>
On 08/26/2014 02:44 PM, Maxim Bublis wrote:
Show 37 quoted lines
> Fixes several problems: > * include config.mak.uname, config.mak.autogen and config.mak > in order to use settings for prefix and other such things; > * link xdiff/lib.a as it is a requirement for libgit.a; > * fix CFLAGS and EXTLIBS for Linux and Mac OS X. > --- > contrib/svn-fe/Makefile | 47 ++++++++++++++++++++++++++++++++++++++--------- > 1 file changed, 38 insertions(+), 9 deletions(-) > > diff --git a/contrib/svn-fe/Makefile b/contrib/svn-fe/Makefile > index 360d8da..8e1d622 100644 > --- a/contrib/svn-fe/Makefile > +++ b/contrib/svn-fe/Makefile > @@ -1,18 +1,45 @@ > all:: svn-fe$X > > -CC = gcc > +CC = cc > RM = rm -f > MV = mv > > CFLAGS = -g -O2 -Wall > LDFLAGS = > -ALL_CFLAGS = $(CFLAGS) > -ALL_LDFLAGS = $(LDFLAGS) > -EXTLIBS = > +EXTLIBS = -lz > + > +include ../../config.mak.uname > +-include ../../config.mak.autogen > +-include ../../config.mak > + > +ifeq ($(uname_S),Darwin) > + CFLAGS += -I/opt/local/include > + LDFLAGS += -L/opt/local/lib > +endif > +
Should it be possible to disable this by using NO_DARWIN_PORTS like we do in the main Makefile ?