From: Brandon Casey Date: Thu, 27 Aug 2009 15:35:46 +0000 (-0500) Subject: Makefile: remove pointless conditional assignment in SunOS section X-Git-Tag: v1.6.5-rc0~38 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b42c9af2cd3dcc56c8aae9a7d73ed1fc342e1f02;p=git.git Makefile: remove pointless conditional assignment in SunOS section It is true that NEEDS_RESOLV is needed on SunOS if NO_IPV6 is set since hstrerror() resides in libresolv, but performing this test at its current location is not very useful. It will only have any effect if the user modifies the make variables from the make command line, and will have no effect if a config.mak file is used. A better location for this conditional would have been further down in the Makefile after the config.mak and config.mak.autogen had been parsed. Rather than adding clutter to the Makefile for a conditional that will likely never be triggered, just remove it, and any user on SunOS that manually sets NO_IPV6 can also set NEEDS_RESOLV. Signed-off-by: Brandon Casey Signed-off-by: Junio C Hamano --- diff --git a/Makefile b/Makefile index 66eedeff4..a9a4d8966 100644 --- a/Makefile +++ b/Makefile @@ -757,9 +757,6 @@ ifeq ($(uname_S),SunOS) NO_C99_FORMAT = YesPlease NO_STRTOUMAX = YesPlease endif - ifdef NO_IPV6 - NEEDS_RESOLV = YesPlease - endif INSTALL = /usr/ucb/install TAR = gtar BASIC_CFLAGS += -D__EXTENSIONS__ -D__sun__ -DHAVE_ALLOCA_H