зеркало из https://github.com/microsoft/git.git
Move Fink and Ports check to after config file
Putting NO_FINK or NO_DARWIN_PORTS in config.mak is ignored because the checks are done before the config is included. Signed-off-by: Brian Gernhardt <benji@silverinsanity.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Родитель
9abd46a347
Коммит
59f8674006
27
Makefile
27
Makefile
|
@ -334,18 +334,6 @@ ifeq ($(uname_S),Darwin)
|
||||||
NEEDS_SSL_WITH_CRYPTO = YesPlease
|
NEEDS_SSL_WITH_CRYPTO = YesPlease
|
||||||
NEEDS_LIBICONV = YesPlease
|
NEEDS_LIBICONV = YesPlease
|
||||||
NO_STRLCPY = YesPlease
|
NO_STRLCPY = YesPlease
|
||||||
ifndef NO_FINK
|
|
||||||
ifeq ($(shell test -d /sw/lib && echo y),y)
|
|
||||||
BASIC_CFLAGS += -I/sw/include
|
|
||||||
BASIC_LDFLAGS += -L/sw/lib
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
ifndef NO_DARWIN_PORTS
|
|
||||||
ifeq ($(shell test -d /opt/local/lib && echo y),y)
|
|
||||||
BASIC_CFLAGS += -I/opt/local/include
|
|
||||||
BASIC_LDFLAGS += -L/opt/local/lib
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
endif
|
endif
|
||||||
ifeq ($(uname_S),SunOS)
|
ifeq ($(uname_S),SunOS)
|
||||||
NEEDS_SOCKET = YesPlease
|
NEEDS_SOCKET = YesPlease
|
||||||
|
@ -423,6 +411,21 @@ endif
|
||||||
-include config.mak.autogen
|
-include config.mak.autogen
|
||||||
-include config.mak
|
-include config.mak
|
||||||
|
|
||||||
|
ifeq ($(uname_S),Darwin)
|
||||||
|
ifndef NO_FINK
|
||||||
|
ifeq ($(shell test -d /sw/lib && echo y),y)
|
||||||
|
BASIC_CFLAGS += -I/sw/include
|
||||||
|
BASIC_LDFLAGS += -L/sw/lib
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
ifndef NO_DARWIN_PORTS
|
||||||
|
ifeq ($(shell test -d /opt/local/lib && echo y),y)
|
||||||
|
BASIC_CFLAGS += -I/opt/local/include
|
||||||
|
BASIC_LDFLAGS += -L/opt/local/lib
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
ifdef WITH_OWN_SUBPROCESS_PY
|
ifdef WITH_OWN_SUBPROCESS_PY
|
||||||
PYMODULES += compat/subprocess.py
|
PYMODULES += compat/subprocess.py
|
||||||
else
|
else
|
||||||
|
|
Загрузка…
Ссылка в новой задаче