{"thread":{"id":"32518","subject":"[PATCH v2 0/2] DEFAULT_DOC_TARGET","startedAt":"2013-01-03T19:05:18Z","lastAt":"2013-01-03T22:25:37Z","messageCount":9,"participants":["Junio C Hamano","Jeff King"],"isPatch":true,"patchVersion":2,"patchTotal":2},"messages":[{"id":"205941","messageId":"1357239920-2201-1-git-send-email-gitster@pobox.com","threadId":"32518","inReplyTo":null,"subject":"[PATCH v2 0/2] DEFAULT_DOC_TARGET","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-01-03T19:05:18Z","receivedAt":"2013-01-03T19:05:18Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"This allows things like:\n\n  $ DEFAULT_DOC_TARGET=html make doc\n  $ DEFAULT_DOC_INSTALL_TARGET=html make install-doc\n\non a platform that does not have manpage viewer.  Which is not very\nuseful, given that you can already say\n\n  $ make install-html\n\non such a platform, and these install-$format targets will not go\naway.\n\nThe real motivation behind this was to let me say:\n\n  $ git checkout $some_old_fork_point\n  $ DEFAULT_DOC_TARGET=git-push.1 make doc\n\nwhile updating the sources to the documentation for the maintainance\ntrack, without having to format everything else that is different\nbetween the old fork point and the primary branch I usually work on.\n\nThe first one was discussed some time ago on the list and all the\nfixes mentioned on the thread already squashed in.  The second one\nis merely for completeness.\n\nFor previous round, see:\n\n  http://thread.gmane.org/gmane.comp.version-control.git/207193/focus=207201\n\nJunio C Hamano (2):\n  Allow generating a non-default set of documentation\n  Allow installing a non-default set of documentation\n\n Documentation/Makefile | 10 ++++++++--\n Makefile               | 13 ++++++++++++-\n 2 files changed, 20 insertions(+), 3 deletions(-)\n\n-- \n1.8.1.293.g4a210a9\n"},{"id":"205943","messageId":"1357239920-2201-2-git-send-email-gitster@pobox.com","threadId":"32518","inReplyTo":"1357239920-2201-1-git-send-email-gitster@pobox.com","subject":"[PATCH v2 1/2] Allow generating a non-default set of documentation","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-01-03T19:05:19Z","receivedAt":"2013-01-03T19:05:19Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"By default, \"make doc\" generates the manpages and htmldocs in the\nDocumentation directory, but you may want to change this depending\non the target environment, e.g. to include 'pdf'.  Introduce a new\nMakefile variable DEFAULT_DOC_TARGET to allow customizing this.\n\nThe primary motivation is to let us check documentation patches with\n\n    $ DEFAULT_DOC_TARGET=git-push.1 make doc\n\nbut it is not so far-fetched to imagine that Windows users may want to\nomit manpages with\n\n    $ DEFAULT_DOC_TARGET=html make doc\n\nor somesuch.  It won't be useful without additional support to tweak\nthe format installed by default via DEFAULT_DOC_INSTALL_TARGET, though.\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>\n---\n Documentation/Makefile |  7 ++++++-\n Makefile               | 10 +++++++++-\n 2 files changed, 15 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/Makefile b/Documentation/Makefile\nindex 063fa69..0f8fdf8 100644\n--- a/Documentation/Makefile\n+++ b/Documentation/Makefile\n@@ -1,3 +1,6 @@\n+# The default target of this Makefile is...\n+all::\n+\n MAN1_TXT= \\\n \t$(filter-out $(addsuffix .txt, $(ARTICLES) $(SP_ARTICLES)), \\\n \t\t$(wildcard git-*.txt)) \\\n@@ -65,6 +68,8 @@ endif\n -include ../config.mak.autogen\n -include ../config.mak\n \n+DEFAULT_DOC_TARGET ?= html man\n+\n #\n # For docbook-xsl ...\n #\t-1.68.1,\tno extra settings are needed?\n@@ -151,7 +156,7 @@ ifndef V\n endif\n endif\n \n-all: html man\n+all:: $(DEFAULT_DOC_TARGET)\n \n html: $(DOC_HTML)\n \ndiff --git a/Makefile b/Makefile\nindex 6b0c961..71655a7 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -281,6 +281,12 @@ all::\n #   DEFAULT_EDITOR='$GIT_FALLBACK_EDITOR',\n #   DEFAULT_EDITOR='\"C:\\Program Files\\Vim\\gvim.exe\" --nofork'\n #\n+# You can define DEFAULT_DOC_TARGET to change it from the built-in\n+# default of generating manpages and htmldocs.  e.g.\n+#\n+#   DEFAULT_DOC_TARGET='man html info pdf'\n+#   DEFAULT_DOC_TARGET='html'\n+#\n # Define COMPUTE_HEADER_DEPENDENCIES to \"yes\" if you want dependencies on\n # header files to be automatically computed, to avoid rebuilding objects when\n # an unrelated header file changes.  Define it to \"no\" to use the hard-coded\n@@ -1421,6 +1427,8 @@ ifneq (,$(SOCKLEN_T))\n \tBASIC_CFLAGS += -Dsocklen_t=$(SOCKLEN_T)\n endif\n \n+DEFAULT_DOC_TARGET ?= html man\n+\n ifeq ($(uname_S),Darwin)\n \tifndef NO_FINK\n \t\tifeq ($(shell test -d /sw/lib && echo y),y)\n@@ -2371,7 +2379,7 @@ $(XDIFF_LIB): $(XDIFF_OBJS)\n $(VCSSVN_LIB): $(VCSSVN_OBJS)\n \t$(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(VCSSVN_OBJS)\n \n-export DEFAULT_EDITOR DEFAULT_PAGER\n+export DEFAULT_EDITOR DEFAULT_PAGER DEFAULT_DOC_TARGET\n \n doc:\n \t$(MAKE) -C Documentation all\n-- \n1.8.1.293.g4a210a9\n"},{"id":"205942","messageId":"1357239920-2201-3-git-send-email-gitster@pobox.com","threadId":"32518","inReplyTo":"1357239920-2201-1-git-send-email-gitster@pobox.com","subject":"[PATCH v2 2/2] Allow installing a non-default set of documentation","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-01-03T19:05:20Z","receivedAt":"2013-01-03T19:05:20Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"In a fashion similar to the previous DEFAULT_DOC_TARGET patch, teach\nthe build procedure to allow installing the documentation sets\nspecified via DEFAULT_DOC_INSTALL_TARGET.\n\nThese two symbols must be separate, as we should allow formatting\nmore than what will be installed.  The default has been to format\nboth html and manpages, and to install only the latter.\n\n    $ make DEFAULT_DOC_INSTALL_TARGET='html man' install-doc\n\nwill format and install both html and manpages.\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>\n---\n Documentation/Makefile | 3 ++-\n Makefile               | 5 ++++-\n 2 files changed, 6 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/Makefile b/Documentation/Makefile\nindex 0f8fdf8..bd7800d 100644\n--- a/Documentation/Makefile\n+++ b/Documentation/Makefile\n@@ -69,6 +69,7 @@ endif\n -include ../config.mak\n \n DEFAULT_DOC_TARGET ?= html man\n+DEFAULT_DOC_INSTALL_TARGET ?= $(DEFAULT_DOC_TARGET)\n \n #\n # For docbook-xsl ...\n@@ -171,7 +172,7 @@ info: git.info gitman.info\n \n pdf: user-manual.pdf\n \n-install: install-man\n+install: $(patsubst %,install-%,$(DEFAULT_DOC_INSTALL_TARGET))\n \n install-man: man\n \t$(INSTALL) -d -m 755 $(DESTDIR)$(man1dir)\ndiff --git a/Makefile b/Makefile\nindex 71655a7..422a15f 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -287,6 +287,8 @@ all::\n #   DEFAULT_DOC_TARGET='man html info pdf'\n #   DEFAULT_DOC_TARGET='html'\n #\n+# DEFAULT_DOC_INSTALL_TARGET can be used in a similar way.\n+#\n # Define COMPUTE_HEADER_DEPENDENCIES to \"yes\" if you want dependencies on\n # header files to be automatically computed, to avoid rebuilding objects when\n # an unrelated header file changes.  Define it to \"no\" to use the hard-coded\n@@ -1428,6 +1430,7 @@ ifneq (,$(SOCKLEN_T))\n endif\n \n DEFAULT_DOC_TARGET ?= html man\n+DEFAULT_DOC_INSTALL_TARGET ?= man\n \n ifeq ($(uname_S),Darwin)\n \tifndef NO_FINK\n@@ -2379,7 +2382,7 @@ $(XDIFF_LIB): $(XDIFF_OBJS)\n $(VCSSVN_LIB): $(VCSSVN_OBJS)\n \t$(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(VCSSVN_OBJS)\n \n-export DEFAULT_EDITOR DEFAULT_PAGER DEFAULT_DOC_TARGET\n+export DEFAULT_EDITOR DEFAULT_PAGER DEFAULT_DOC_TARGET DEFAULT_DOC_INSTALL_TARGET\n \n doc:\n \t$(MAKE) -C Documentation all\n-- \n1.8.1.293.g4a210a9\n"},{"id":"205947","messageId":"20130103203222.GB4632@sigill.intra.peff.net","threadId":"32518","inReplyTo":"1357239920-2201-1-git-send-email-gitster@pobox.com","subject":"Re: [PATCH v2 0/2] DEFAULT_DOC_TARGET","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2013-01-03T20:32:22Z","receivedAt":"2013-01-03T20:32:22Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Thu, Jan 03, 2013 at 11:05:18AM -0800, Junio C Hamano wrote:\n\n> This allows things like:\n> \n>   $ DEFAULT_DOC_TARGET=html make doc\n>   $ DEFAULT_DOC_INSTALL_TARGET=html make install-doc\n> \n> on a platform that does not have manpage viewer.  Which is not very\n> useful, given that you can already say\n> \n>   $ make install-html\n> \n> on such a platform, and these install-$format targets will not go\n> away.\n\nI think the usefulness is that it can be set by default for a particular\nuname, so people on Windows can just type \"make install-doc\" without\nhaving to care about setting anything (though to be honest, I do not\neven know what they build by default; maybe they do build manpages).\nExcept that in the original thread:\n\n>   http://thread.gmane.org/gmane.comp.version-control.git/207193/focus=207201\n\nit became clear that to do that we would also want to hoist the uname\nautomagic defaults into their own file that could be read from\nDocumentation/Makefile.\n\n> The real motivation behind this was to let me say:\n> \n>   $ git checkout $some_old_fork_point\n>   $ DEFAULT_DOC_TARGET=git-push.1 make doc\n> \n> while updating the sources to the documentation for the maintainance\n> track, without having to format everything else that is different\n> between the old fork point and the primary branch I usually work on.\n\nI still don't see how this is any advantage over:\n\n  make -C Documentation git-push.1\n\n> The first one was discussed some time ago on the list and all the\n> fixes mentioned on the thread already squashed in.  The second one\n> is merely for completeness.\n\nI wonder...do we really need DEFAULT_DOC_INSTALL_TARGET? Why isn't it\nthe same as DEFAULT_DOC_TARGET? I realize that right now we build html\nand manpages by default, but only install man. But then why do we bother\nbuilding html then?\n\n-Peff\n"},{"id":"205950","messageId":"20130103203738.GA8269@sigill.intra.peff.net","threadId":"32518","inReplyTo":"20130103203222.GB4632@sigill.intra.peff.net","subject":"Re: [PATCH v2 0/2] DEFAULT_DOC_TARGET","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2013-01-03T20:37:39Z","receivedAt":"2013-01-03T20:37:39Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Thu, Jan 03, 2013 at 03:32:22PM -0500, Jeff King wrote:\n\n> On Thu, Jan 03, 2013 at 11:05:18AM -0800, Junio C Hamano wrote:\n> \n> > This allows things like:\n> > \n> >   $ DEFAULT_DOC_TARGET=html make doc\n> >   $ DEFAULT_DOC_INSTALL_TARGET=html make install-doc\n> > \n> > on a platform that does not have manpage viewer.  Which is not very\n> > useful, given that you can already say\n> > \n> >   $ make install-html\n> > \n> > on such a platform, and these install-$format targets will not go\n> > away.\n> \n> I think the usefulness is that it can be set by default for a particular\n> uname, so people on Windows can just type \"make install-doc\" without\n> having to care about setting anything (though to be honest, I do not\n> even know what they build by default; maybe they do build manpages).\n\nI also notice that we have DEFAULT_HELP_FORMAT (which is \"html\" on\nWindows). Wouldn't that be a sane default for DEFAULT_DOC_TARGET if it\nis set? I guess we can set all three independently for maximum\nflexibility, though, but it seems like a sane fallback.\n\n-Peff\n"},{"id":"205955","messageId":"20130103210541.GA11783@sigill.intra.peff.net","threadId":"32518","inReplyTo":"20130103203222.GB4632@sigill.intra.peff.net","subject":"Re: [PATCH v2 0/2] DEFAULT_DOC_TARGET","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2013-01-03T21:05:41Z","receivedAt":"2013-01-03T21:05:41Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Thu, Jan 03, 2013 at 03:32:22PM -0500, Jeff King wrote:\n\n> I think the usefulness is that it can be set by default for a particular\n> uname, so people on Windows can just type \"make install-doc\" without\n> having to care about setting anything (though to be honest, I do not\n> even know what they build by default; maybe they do build manpages).\n> Except that in the original thread:\n> \n> >   http://thread.gmane.org/gmane.comp.version-control.git/207193/focus=207201\n> \n> it became clear that to do that we would also want to hoist the uname\n> automagic defaults into their own file that could be read from\n> Documentation/Makefile.\n\nIOW, this (on the current master), which I think is a nice cleanup\nregardless of this series:\n\n-- >8 --\nSubject: [PATCH] Makefile: hoist uname autodetection to config.mak.uname\n\nOur Makefile first sets up some sane per-platform defaults\nby looking at \"uname\", then modifies that according to the\nresults of autoconf (if any), then modifies that according\nto the user's wishes in config.mak.\n\nFor sub-Makefiles like Documentation/Makefile, the latter\ntwo are available, but the uname defaults are available only\nto the main Makefile. This hasn't been a problem so far,\nbecause the sub-Makefiles do not rely on any of those\nautomatic settings to do their work.\n\nThis patch puts the uname magic into its own file so it can\nbe reused in other Makefiles, opening up the possibility of\nnew knobs.\n\nNote that we leave one reference to uname in the top-level\nMakefile: if we are on Darwin, we must check the NO_FINK and\nNO_DARWIN_PORTS settings. But because we are combining uname\nsettings with user-options, we must do so after all of the\nconfig is loaded. This is acceptable, as the resulting\nconditionals are about setting variables specific to the\ntop-level Makefile (and if that ever changes, we can hoist\nthem into a separate post-config include, too).\n\nSigned-off-by: Jeff King <peff@peff.net>\n---\nI'm happy to call it \"config.mak.autodetect\" if you prefer. My rationale\nwas that we might eventually have several levels of autodetection, and\nwe would want to be able to order them individually (in fact, we already\ndo; config.mak.autogen is another form that should take precedence over\nuname detection, and it is already split out).\n\n Makefile         | 526 +------------------------------------------------------\n config.mak.uname | 522 ++++++++++++++++++++++++++++++++++++++++++++++++++++++\n 2 files changed, 523 insertions(+), 525 deletions(-)\n create mode 100644 config.mak.uname\n\ndiff --git a/Makefile b/Makefile\nindex 736ecd4..5e4ee47 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -326,19 +326,6 @@ GIT-VERSION-FILE: FORCE\n \t@$(SHELL_PATH) ./GIT-VERSION-GEN\n -include GIT-VERSION-FILE\n \n-uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')\n-uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')\n-uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not')\n-uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not')\n-uname_P := $(shell sh -c 'uname -p 2>/dev/null || echo not')\n-uname_V := $(shell sh -c 'uname -v 2>/dev/null || echo not')\n-\n-ifdef MSVC\n-\t# avoid the MingW and Cygwin configuration sections\n-\tuname_S := Windows\n-\tuname_O := Windows\n-endif\n-\n # CFLAGS and LDFLAGS are for the users to override from the command line.\n \n CFLAGS = -g -O2 -Wall\n@@ -937,518 +924,7 @@ GIT_USER_AGENT = git/$(GIT_VERSION)\n \n GIT_USER_AGENT = git/$(GIT_VERSION)\n \n-#\n-# Platform specific tweaks\n-#\n-\n-# We choose to avoid \"if .. else if .. else .. endif endif\"\n-# because maintaining the nesting to match is a pain.  If\n-# we had \"elif\" things would have been much nicer...\n-\n-ifeq ($(uname_M),x86_64)\n-\tXDL_FAST_HASH = YesPlease\n-endif\n-ifeq ($(uname_S),OSF1)\n-\t# Need this for u_short definitions et al\n-\tBASIC_CFLAGS += -D_OSF_SOURCE\n-\tSOCKLEN_T = int\n-\tNO_STRTOULL = YesPlease\n-\tNO_NSEC = YesPlease\n-endif\n-ifeq ($(uname_S),Linux)\n-\tNO_STRLCPY = YesPlease\n-\tNO_MKSTEMPS = YesPlease\n-\tHAVE_PATHS_H = YesPlease\n-\tLIBC_CONTAINS_LIBINTL = YesPlease\n-\tHAVE_DEV_TTY = YesPlease\n-endif\n-ifeq ($(uname_S),GNU/kFreeBSD)\n-\tNO_STRLCPY = YesPlease\n-\tNO_MKSTEMPS = YesPlease\n-\tHAVE_PATHS_H = YesPlease\n-\tDIR_HAS_BSD_GROUP_SEMANTICS = YesPlease\n-\tLIBC_CONTAINS_LIBINTL = YesPlease\n-endif\n-ifeq ($(uname_S),UnixWare)\n-\tCC = cc\n-\tNEEDS_SOCKET = YesPlease\n-\tNEEDS_NSL = YesPlease\n-\tNEEDS_SSL_WITH_CRYPTO = YesPlease\n-\tNEEDS_LIBICONV = YesPlease\n-\tSHELL_PATH = /usr/local/bin/bash\n-\tNO_IPV6 = YesPlease\n-\tNO_HSTRERROR = YesPlease\n-\tNO_MKSTEMPS = YesPlease\n-\tBASIC_CFLAGS += -Kthread\n-\tBASIC_CFLAGS += -I/usr/local/include\n-\tBASIC_LDFLAGS += -L/usr/local/lib\n-\tINSTALL = ginstall\n-\tTAR = gtar\n-\tNO_STRCASESTR = YesPlease\n-\tNO_MEMMEM = YesPlease\n-endif\n-ifeq ($(uname_S),SCO_SV)\n-\tifeq ($(uname_R),3.2)\n-\t\tCFLAGS = -O2\n-\tendif\n-\tifeq ($(uname_R),5)\n-\t\tCC = cc\n-\t\tBASIC_CFLAGS += -Kthread\n-\tendif\n-\tNEEDS_SOCKET = YesPlease\n-\tNEEDS_NSL = YesPlease\n-\tNEEDS_SSL_WITH_CRYPTO = YesPlease\n-\tNEEDS_LIBICONV = YesPlease\n-\tSHELL_PATH = /usr/bin/bash\n-\tNO_IPV6 = YesPlease\n-\tNO_HSTRERROR = YesPlease\n-\tNO_MKSTEMPS = YesPlease\n-\tBASIC_CFLAGS += -I/usr/local/include\n-\tBASIC_LDFLAGS += -L/usr/local/lib\n-\tNO_STRCASESTR = YesPlease\n-\tNO_MEMMEM = YesPlease\n-\tINSTALL = ginstall\n-\tTAR = gtar\n-endif\n-ifeq ($(uname_S),Darwin)\n-\tNEEDS_CRYPTO_WITH_SSL = YesPlease\n-\tNEEDS_SSL_WITH_CRYPTO = YesPlease\n-\tNEEDS_LIBICONV = YesPlease\n-\tifeq ($(shell expr \"$(uname_R)\" : '[15678]\\.'),2)\n-\t\tOLD_ICONV = UnfortunatelyYes\n-\tendif\n-\tifeq ($(shell expr \"$(uname_R)\" : '[15]\\.'),2)\n-\t\tNO_STRLCPY = YesPlease\n-\tendif\n-\tNO_MEMMEM = YesPlease\n-\tUSE_ST_TIMESPEC = YesPlease\n-\tHAVE_DEV_TTY = YesPlease\n-\tCOMPAT_OBJS += compat/precompose_utf8.o\n-\tBASIC_CFLAGS += -DPRECOMPOSE_UNICODE\n-endif\n-ifeq ($(uname_S),SunOS)\n-\tNEEDS_SOCKET = YesPlease\n-\tNEEDS_NSL = YesPlease\n-\tSHELL_PATH = /bin/bash\n-\tSANE_TOOL_PATH = /usr/xpg6/bin:/usr/xpg4/bin\n-\tNO_STRCASESTR = YesPlease\n-\tNO_MEMMEM = YesPlease\n-\tNO_MKDTEMP = YesPlease\n-\tNO_MKSTEMPS = YesPlease\n-\tNO_REGEX = YesPlease\n-\tNO_FNMATCH_CASEFOLD = YesPlease\n-\tNO_MSGFMT_EXTENDED_OPTIONS = YesPlease\n-\tHAVE_DEV_TTY = YesPlease\n-\tifeq ($(uname_R),5.6)\n-\t\tSOCKLEN_T = int\n-\t\tNO_HSTRERROR = YesPlease\n-\t\tNO_IPV6 = YesPlease\n-\t\tNO_SOCKADDR_STORAGE = YesPlease\n-\t\tNO_UNSETENV = YesPlease\n-\t\tNO_SETENV = YesPlease\n-\t\tNO_STRLCPY = YesPlease\n-\t\tNO_STRTOUMAX = YesPlease\n-\t\tGIT_TEST_CMP = cmp\n-\tendif\n-\tifeq ($(uname_R),5.7)\n-\t\tNEEDS_RESOLV = YesPlease\n-\t\tNO_IPV6 = YesPlease\n-\t\tNO_SOCKADDR_STORAGE = YesPlease\n-\t\tNO_UNSETENV = YesPlease\n-\t\tNO_SETENV = YesPlease\n-\t\tNO_STRLCPY = YesPlease\n-\t\tNO_STRTOUMAX = YesPlease\n-\t\tGIT_TEST_CMP = cmp\n-\tendif\n-\tifeq ($(uname_R),5.8)\n-\t\tNO_UNSETENV = YesPlease\n-\t\tNO_SETENV = YesPlease\n-\t\tNO_STRTOUMAX = YesPlease\n-\t\tGIT_TEST_CMP = cmp\n-\tendif\n-\tifeq ($(uname_R),5.9)\n-\t\tNO_UNSETENV = YesPlease\n-\t\tNO_SETENV = YesPlease\n-\t\tNO_STRTOUMAX = YesPlease\n-\t\tGIT_TEST_CMP = cmp\n-\tendif\n-\tINSTALL = /usr/ucb/install\n-\tTAR = gtar\n-\tBASIC_CFLAGS += -D__EXTENSIONS__ -D__sun__ -DHAVE_ALLOCA_H\n-endif\n-ifeq ($(uname_O),Cygwin)\n-\tifeq ($(shell expr \"$(uname_R)\" : '1\\.[1-6]\\.'),4)\n-\t\tNO_D_TYPE_IN_DIRENT = YesPlease\n-\t\tNO_D_INO_IN_DIRENT = YesPlease\n-\t\tNO_STRCASESTR = YesPlease\n-\t\tNO_MEMMEM = YesPlease\n-\t\tNO_MKSTEMPS = YesPlease\n-\t\tNO_SYMLINK_HEAD = YesPlease\n-\t\tNO_IPV6 = YesPlease\n-\t\tOLD_ICONV = UnfortunatelyYes\n-\t\tCYGWIN_V15_WIN32API = YesPlease\n-\tendif\n-\tNO_THREAD_SAFE_PREAD = YesPlease\n-\tNEEDS_LIBICONV = YesPlease\n-\tNO_FAST_WORKING_DIRECTORY = UnfortunatelyYes\n-\tNO_TRUSTABLE_FILEMODE = UnfortunatelyYes\n-\tNO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease\n-\t# There are conflicting reports about this.\n-\t# On some boxes NO_MMAP is needed, and not so elsewhere.\n-\t# Try commenting this out if you suspect MMAP is more efficient\n-\tNO_MMAP = YesPlease\n-\tX = .exe\n-\tCOMPAT_OBJS += compat/cygwin.o\n-\tUNRELIABLE_FSTAT = UnfortunatelyYes\n-\tSPARSE_FLAGS = -isystem /usr/include/w32api -Wno-one-bit-signed-bitfield\n-endif\n-ifeq ($(uname_S),FreeBSD)\n-\tNEEDS_LIBICONV = YesPlease\n-\tOLD_ICONV = YesPlease\n-\tNO_MEMMEM = YesPlease\n-\tBASIC_CFLAGS += -I/usr/local/include\n-\tBASIC_LDFLAGS += -L/usr/local/lib\n-\tDIR_HAS_BSD_GROUP_SEMANTICS = YesPlease\n-\tUSE_ST_TIMESPEC = YesPlease\n-\tifeq ($(shell expr \"$(uname_R)\" : '4\\.'),2)\n-\t\tPTHREAD_LIBS = -pthread\n-\t\tNO_UINTMAX_T = YesPlease\n-\t\tNO_STRTOUMAX = YesPlease\n-\tendif\n-\tPYTHON_PATH = /usr/local/bin/python\n-\tHAVE_PATHS_H = YesPlease\n-endif\n-ifeq ($(uname_S),OpenBSD)\n-\tNO_STRCASESTR = YesPlease\n-\tNO_MEMMEM = YesPlease\n-\tUSE_ST_TIMESPEC = YesPlease\n-\tNEEDS_LIBICONV = YesPlease\n-\tBASIC_CFLAGS += -I/usr/local/include\n-\tBASIC_LDFLAGS += -L/usr/local/lib\n-\tHAVE_PATHS_H = YesPlease\n-endif\n-ifeq ($(uname_S),NetBSD)\n-\tifeq ($(shell expr \"$(uname_R)\" : '[01]\\.'),2)\n-\t\tNEEDS_LIBICONV = YesPlease\n-\tendif\n-\tBASIC_CFLAGS += -I/usr/pkg/include\n-\tBASIC_LDFLAGS += -L/usr/pkg/lib $(CC_LD_DYNPATH)/usr/pkg/lib\n-\tUSE_ST_TIMESPEC = YesPlease\n-\tNO_MKSTEMPS = YesPlease\n-\tHAVE_PATHS_H = YesPlease\n-endif\n-ifeq ($(uname_S),AIX)\n-\tDEFAULT_PAGER = more\n-\tNO_STRCASESTR = YesPlease\n-\tNO_MEMMEM = YesPlease\n-\tNO_MKDTEMP = YesPlease\n-\tNO_MKSTEMPS = YesPlease\n-\tNO_STRLCPY = YesPlease\n-\tNO_NSEC = YesPlease\n-\tFREAD_READS_DIRECTORIES = UnfortunatelyYes\n-\tINTERNAL_QSORT = UnfortunatelyYes\n-\tNEEDS_LIBICONV = YesPlease\n-\tBASIC_CFLAGS += -D_LARGE_FILES\n-\tifeq ($(shell expr \"$(uname_V)\" : '[1234]'),1)\n-\t\tNO_PTHREADS = YesPlease\n-\telse\n-\t\tPTHREAD_LIBS = -lpthread\n-\tendif\n-\tifeq ($(shell expr \"$(uname_V).$(uname_R)\" : '5\\.1'),3)\n-\t\tINLINE = ''\n-\tendif\n-\tGIT_TEST_CMP = cmp\n-endif\n-ifeq ($(uname_S),GNU)\n-\t# GNU/Hurd\n-\tNO_STRLCPY = YesPlease\n-\tNO_MKSTEMPS = YesPlease\n-\tHAVE_PATHS_H = YesPlease\n-\tLIBC_CONTAINS_LIBINTL = YesPlease\n-endif\n-ifeq ($(uname_S),IRIX)\n-\tNO_SETENV = YesPlease\n-\tNO_UNSETENV = YesPlease\n-\tNO_STRCASESTR = YesPlease\n-\tNO_MEMMEM = YesPlease\n-\tNO_MKSTEMPS = YesPlease\n-\tNO_MKDTEMP = YesPlease\n-\t# When compiled with the MIPSpro 7.4.4m compiler, and without pthreads\n-\t# (i.e. NO_PTHREADS is set), and _with_ MMAP (i.e. NO_MMAP is not set),\n-\t# git dies with a segmentation fault when trying to access the first\n-\t# entry of a reflog.  The conservative choice is made to always set\n-\t# NO_MMAP.  If you suspect that your compiler is not affected by this\n-\t# issue, comment out the NO_MMAP statement.\n-\tNO_MMAP = YesPlease\n-\tNO_REGEX = YesPlease\n-\tNO_FNMATCH_CASEFOLD = YesPlease\n-\tSNPRINTF_RETURNS_BOGUS = YesPlease\n-\tSHELL_PATH = /usr/gnu/bin/bash\n-\tNEEDS_LIBGEN = YesPlease\n-endif\n-ifeq ($(uname_S),IRIX64)\n-\tNO_SETENV = YesPlease\n-\tNO_UNSETENV = YesPlease\n-\tNO_STRCASESTR = YesPlease\n-\tNO_MEMMEM = YesPlease\n-\tNO_MKSTEMPS = YesPlease\n-\tNO_MKDTEMP = YesPlease\n-\t# When compiled with the MIPSpro 7.4.4m compiler, and without pthreads\n-\t# (i.e. NO_PTHREADS is set), and _with_ MMAP (i.e. NO_MMAP is not set),\n-\t# git dies with a segmentation fault when trying to access the first\n-\t# entry of a reflog.  The conservative choice is made to always set\n-\t# NO_MMAP.  If you suspect that your compiler is not affected by this\n-\t# issue, comment out the NO_MMAP statement.\n-\tNO_MMAP = YesPlease\n-\tNO_REGEX = YesPlease\n-\tNO_FNMATCH_CASEFOLD = YesPlease\n-\tSNPRINTF_RETURNS_BOGUS = YesPlease\n-\tSHELL_PATH = /usr/gnu/bin/bash\n-\tNEEDS_LIBGEN = YesPlease\n-endif\n-ifeq ($(uname_S),HP-UX)\n-\tINLINE = __inline\n-\tNO_IPV6 = YesPlease\n-\tNO_SETENV = YesPlease\n-\tNO_STRCASESTR = YesPlease\n-\tNO_MEMMEM = YesPlease\n-\tNO_MKSTEMPS = YesPlease\n-\tNO_STRLCPY = YesPlease\n-\tNO_MKDTEMP = YesPlease\n-\tNO_UNSETENV = YesPlease\n-\tNO_HSTRERROR = YesPlease\n-\tNO_SYS_SELECT_H = YesPlease\n-\tNO_FNMATCH_CASEFOLD = YesPlease\n-\tSNPRINTF_RETURNS_BOGUS = YesPlease\n-\tNO_NSEC = YesPlease\n-\tifeq ($(uname_R),B.11.00)\n-\t\tNO_INET_NTOP = YesPlease\n-\t\tNO_INET_PTON = YesPlease\n-\tendif\n-\tifeq ($(uname_R),B.10.20)\n-\t\t# Override HP-UX 11.x setting:\n-\t\tINLINE =\n-\t\tSOCKLEN_T = size_t\n-\t\tNO_PREAD = YesPlease\n-\t\tNO_INET_NTOP = YesPlease\n-\t\tNO_INET_PTON = YesPlease\n-\tendif\n-\tGIT_TEST_CMP = cmp\n-endif\n-ifeq ($(uname_S),Windows)\n-\tGIT_VERSION := $(GIT_VERSION).MSVC\n-\tpathsep = ;\n-\tNO_PREAD = YesPlease\n-\tNEEDS_CRYPTO_WITH_SSL = YesPlease\n-\tNO_LIBGEN_H = YesPlease\n-\tNO_POLL = YesPlease\n-\tNO_SYMLINK_HEAD = YesPlease\n-\tNO_IPV6 = YesPlease\n-\tNO_UNIX_SOCKETS = YesPlease\n-\tNO_SETENV = YesPlease\n-\tNO_UNSETENV = YesPlease\n-\tNO_STRCASESTR = YesPlease\n-\tNO_STRLCPY = YesPlease\n-\tNO_STRTOK_R = YesPlease\n-\tNO_FNMATCH = YesPlease\n-\tNO_MEMMEM = YesPlease\n-\t# NEEDS_LIBICONV = YesPlease\n-\tNO_ICONV = YesPlease\n-\tNO_STRTOUMAX = YesPlease\n-\tNO_STRTOULL = YesPlease\n-\tNO_MKDTEMP = YesPlease\n-\tNO_MKSTEMPS = YesPlease\n-\tSNPRINTF_RETURNS_BOGUS = YesPlease\n-\tNO_SVN_TESTS = YesPlease\n-\tNO_PERL_MAKEMAKER = YesPlease\n-\tRUNTIME_PREFIX = YesPlease\n-\tNO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease\n-\tNO_NSEC = YesPlease\n-\tUSE_WIN32_MMAP = YesPlease\n-\t# USE_NED_ALLOCATOR = YesPlease\n-\tUNRELIABLE_FSTAT = UnfortunatelyYes\n-\tOBJECT_CREATION_USES_RENAMES = UnfortunatelyNeedsTo\n-\tNO_REGEX = YesPlease\n-\tNO_CURL = YesPlease\n-\tNO_PYTHON = YesPlease\n-\tBLK_SHA1 = YesPlease\n-\tNO_POSIX_GOODIES = UnfortunatelyYes\n-\tNATIVE_CRLF = YesPlease\n-\tDEFAULT_HELP_FORMAT = html\n-\n-\tCC = compat/vcbuild/scripts/clink.pl\n-\tAR = compat/vcbuild/scripts/lib.pl\n-\tCFLAGS =\n-\tBASIC_CFLAGS = -nologo -I. -I../zlib -Icompat/vcbuild -Icompat/vcbuild/include -DWIN32 -D_CONSOLE -DHAVE_STRING_H -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE\n-\tCOMPAT_OBJS = compat/msvc.o compat/winansi.o \\\n-\t\tcompat/win32/pthread.o compat/win32/syslog.o \\\n-\t\tcompat/win32/dirent.o\n-\tCOMPAT_CFLAGS = -D__USE_MINGW_ACCESS -DNOGDI -DHAVE_STRING_H -DHAVE_ALLOCA_H -Icompat -Icompat/regex -Icompat/win32 -DSTRIP_EXTENSION=\\\".exe\\\"\n-\tBASIC_LDFLAGS = -IGNORE:4217 -IGNORE:4049 -NOLOGO -SUBSYSTEM:CONSOLE -NODEFAULTLIB:MSVCRT.lib\n-\tEXTLIBS = user32.lib advapi32.lib shell32.lib wininet.lib ws2_32.lib\n-\tPTHREAD_LIBS =\n-\tlib =\n-ifndef DEBUG\n-\tBASIC_CFLAGS += -GL -Os -MT\n-\tBASIC_LDFLAGS += -LTCG\n-\tAR += -LTCG\n-else\n-\tBASIC_CFLAGS += -Zi -MTd\n-endif\n-\tX = .exe\n-endif\n-ifeq ($(uname_S),Interix)\n-\tNO_INITGROUPS = YesPlease\n-\tNO_IPV6 = YesPlease\n-\tNO_MEMMEM = YesPlease\n-\tNO_MKDTEMP = YesPlease\n-\tNO_STRTOUMAX = YesPlease\n-\tNO_NSEC = YesPlease\n-\tNO_MKSTEMPS = YesPlease\n-\tifeq ($(uname_R),3.5)\n-\t\tNO_INET_NTOP = YesPlease\n-\t\tNO_INET_PTON = YesPlease\n-\t\tNO_SOCKADDR_STORAGE = YesPlease\n-\t\tNO_FNMATCH_CASEFOLD = YesPlease\n-\tendif\n-\tifeq ($(uname_R),5.2)\n-\t\tNO_INET_NTOP = YesPlease\n-\t\tNO_INET_PTON = YesPlease\n-\t\tNO_SOCKADDR_STORAGE = YesPlease\n-\t\tNO_FNMATCH_CASEFOLD = YesPlease\n-\tendif\n-endif\n-ifeq ($(uname_S),Minix)\n-\tNO_IPV6 = YesPlease\n-\tNO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease\n-\tNO_NSEC = YesPlease\n-\tNEEDS_LIBGEN =\n-\tNEEDS_CRYPTO_WITH_SSL = YesPlease\n-\tNEEDS_IDN_WITH_CURL = YesPlease\n-\tNEEDS_SSL_WITH_CURL = YesPlease\n-\tNEEDS_RESOLV =\n-\tNO_HSTRERROR = YesPlease\n-\tNO_MMAP = YesPlease\n-\tNO_CURL =\n-\tNO_EXPAT =\n-endif\n-ifeq ($(uname_S),NONSTOP_KERNEL)\n-\t# Needs some C99 features, \"inline\" is just one of them.\n-\t# INLINE='' would just replace one set of warnings with another and\n-\t# still not compile in c89 mode, due to non-const array initializations.\n-\tCC = cc -c99\n-\t# Disable all optimization, seems to result in bad code, with -O or -O2\n-\t# or even -O1 (default), /usr/local/libexec/git-core/git-pack-objects\n-\t# abends on \"git push\". Needs more investigation.\n-\tCFLAGS = -g -O0\n-\t# We'd want it to be here.\n-\tprefix = /usr/local\n-\t# Our's are in ${prefix}/bin (perl might also be in /usr/bin/perl).\n-\tPERL_PATH = ${prefix}/bin/perl\n-\tPYTHON_PATH = ${prefix}/bin/python\n-\n-\t# As detected by './configure'.\n-\t# Missdetected, hence commented out, see below.\n-\t#NO_CURL = YesPlease\n-\t# Added manually, see above.\n-\tNEEDS_SSL_WITH_CURL = YesPlease\n-\tHAVE_LIBCHARSET_H = YesPlease\n-\tNEEDS_LIBICONV = YesPlease\n-\tNEEDS_LIBINTL_BEFORE_LIBICONV = YesPlease\n-\tNO_SYS_SELECT_H = UnfortunatelyYes\n-\tNO_D_TYPE_IN_DIRENT = YesPlease\n-\tNO_HSTRERROR = YesPlease\n-\tNO_STRCASESTR = YesPlease\n-\tNO_FNMATCH_CASEFOLD = YesPlease\n-\tNO_MEMMEM = YesPlease\n-\tNO_STRLCPY = YesPlease\n-\tNO_SETENV = YesPlease\n-\tNO_UNSETENV = YesPlease\n-\tNO_MKDTEMP = YesPlease\n-\tNO_MKSTEMPS = YesPlease\n-\t# Currently libiconv-1.9.1.\n-\tOLD_ICONV = UnfortunatelyYes\n-\tNO_REGEX = YesPlease\n-\tNO_PTHREADS = UnfortunatelyYes\n-\n-\t# Not detected (nor checked for) by './configure'.\n-\t# We don't have SA_RESTART on NonStop, unfortunalety.\n-\tCOMPAT_CFLAGS += -DSA_RESTART=0\n-\t# Apparently needed in compat/fnmatch/fnmatch.c.\n-\tCOMPAT_CFLAGS += -DHAVE_STRING_H=1\n-\tNO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease\n-\tNO_NSEC = YesPlease\n-\tNO_PREAD = YesPlease\n-\tNO_MMAP = YesPlease\n-\tNO_POLL = YesPlease\n-\tNO_INTPTR_T = UnfortunatelyYes\n-\t# Bug report 10-120822-4477 submitted to HP NonStop development.\n-\tMKDIR_WO_TRAILING_SLASH = YesPlease\n-\t# RFE 10-120912-4693 submitted to HP NonStop development.\n-\tNO_SETITIMER = UnfortunatelyYes\n-\tSANE_TOOL_PATH = /usr/coreutils/bin:/usr/local/bin\n-\tSHELL_PATH = /usr/local/bin/bash\n-\t# as of H06.25/J06.14, we might better use this\n-\t#SHELL_PATH = /usr/coreutils/bin/bash\n-endif\n-ifneq (,$(findstring MINGW,$(uname_S)))\n-\tpathsep = ;\n-\tNO_PREAD = YesPlease\n-\tNEEDS_CRYPTO_WITH_SSL = YesPlease\n-\tNO_LIBGEN_H = YesPlease\n-\tNO_POLL = YesPlease\n-\tNO_SYMLINK_HEAD = YesPlease\n-\tNO_UNIX_SOCKETS = YesPlease\n-\tNO_SETENV = YesPlease\n-\tNO_UNSETENV = YesPlease\n-\tNO_STRCASESTR = YesPlease\n-\tNO_STRLCPY = YesPlease\n-\tNO_STRTOK_R = YesPlease\n-\tNO_FNMATCH = YesPlease\n-\tNO_MEMMEM = YesPlease\n-\tNEEDS_LIBICONV = YesPlease\n-\tOLD_ICONV = YesPlease\n-\tNO_STRTOUMAX = YesPlease\n-\tNO_MKDTEMP = YesPlease\n-\tNO_MKSTEMPS = YesPlease\n-\tNO_SVN_TESTS = YesPlease\n-\tNO_PERL_MAKEMAKER = YesPlease\n-\tRUNTIME_PREFIX = YesPlease\n-\tNO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease\n-\tNO_NSEC = YesPlease\n-\tUSE_WIN32_MMAP = YesPlease\n-\tUSE_NED_ALLOCATOR = YesPlease\n-\tUNRELIABLE_FSTAT = UnfortunatelyYes\n-\tOBJECT_CREATION_USES_RENAMES = UnfortunatelyNeedsTo\n-\tNO_REGEX = YesPlease\n-\tNO_PYTHON = YesPlease\n-\tBLK_SHA1 = YesPlease\n-\tETAGS_TARGET = ETAGS\n-\tNO_INET_PTON = YesPlease\n-\tNO_INET_NTOP = YesPlease\n-\tNO_POSIX_GOODIES = UnfortunatelyYes\n-\tCOMPAT_CFLAGS += -D__USE_MINGW_ACCESS -DNOGDI -Icompat -Icompat/win32\n-\tCOMPAT_CFLAGS += -DSTRIP_EXTENSION=\\\".exe\\\"\n-\tCOMPAT_OBJS += compat/mingw.o compat/winansi.o \\\n-\t\tcompat/win32/pthread.o compat/win32/syslog.o \\\n-\t\tcompat/win32/dirent.o\n-\tEXTLIBS += -lws2_32\n-\tPTHREAD_LIBS =\n-\tX = .exe\n-\tSPARSE_FLAGS = -Wno-one-bit-signed-bitfield\n-ifneq (,$(wildcard ../THIS_IS_MSYSGIT))\n-\thtmldir = doc/git/html/\n-\tprefix =\n-\tINSTALL = /bin/install\n-\tEXTLIBS += /mingw/lib/libz.a\n-\tNO_R_TO_GCC_LINKER = YesPlease\n-\tINTERNAL_QSORT = YesPlease\n-\tHAVE_LIBCHARSET_H = YesPlease\n-else\n-\tNO_CURL = YesPlease\n-endif\n-endif\n-\n+include config.mak.uname\n -include config.mak.autogen\n -include config.mak\n \ndiff --git a/config.mak.uname b/config.mak.uname\nnew file mode 100644\nindex 0000000..3ccbb8e\n--- /dev/null\n+++ b/config.mak.uname\n@@ -0,0 +1,522 @@\n+# Platform specific Makefile tweaks based on uname detection\n+\n+uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')\n+uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')\n+uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not')\n+uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not')\n+uname_P := $(shell sh -c 'uname -p 2>/dev/null || echo not')\n+uname_V := $(shell sh -c 'uname -v 2>/dev/null || echo not')\n+\n+ifdef MSVC\n+\t# avoid the MingW and Cygwin configuration sections\n+\tuname_S := Windows\n+\tuname_O := Windows\n+endif\n+\n+# We choose to avoid \"if .. else if .. else .. endif endif\"\n+# because maintaining the nesting to match is a pain.  If\n+# we had \"elif\" things would have been much nicer...\n+\n+ifeq ($(uname_M),x86_64)\n+\tXDL_FAST_HASH = YesPlease\n+endif\n+ifeq ($(uname_S),OSF1)\n+\t# Need this for u_short definitions et al\n+\tBASIC_CFLAGS += -D_OSF_SOURCE\n+\tSOCKLEN_T = int\n+\tNO_STRTOULL = YesPlease\n+\tNO_NSEC = YesPlease\n+endif\n+ifeq ($(uname_S),Linux)\n+\tNO_STRLCPY = YesPlease\n+\tNO_MKSTEMPS = YesPlease\n+\tHAVE_PATHS_H = YesPlease\n+\tLIBC_CONTAINS_LIBINTL = YesPlease\n+\tHAVE_DEV_TTY = YesPlease\n+endif\n+ifeq ($(uname_S),GNU/kFreeBSD)\n+\tNO_STRLCPY = YesPlease\n+\tNO_MKSTEMPS = YesPlease\n+\tHAVE_PATHS_H = YesPlease\n+\tDIR_HAS_BSD_GROUP_SEMANTICS = YesPlease\n+\tLIBC_CONTAINS_LIBINTL = YesPlease\n+endif\n+ifeq ($(uname_S),UnixWare)\n+\tCC = cc\n+\tNEEDS_SOCKET = YesPlease\n+\tNEEDS_NSL = YesPlease\n+\tNEEDS_SSL_WITH_CRYPTO = YesPlease\n+\tNEEDS_LIBICONV = YesPlease\n+\tSHELL_PATH = /usr/local/bin/bash\n+\tNO_IPV6 = YesPlease\n+\tNO_HSTRERROR = YesPlease\n+\tNO_MKSTEMPS = YesPlease\n+\tBASIC_CFLAGS += -Kthread\n+\tBASIC_CFLAGS += -I/usr/local/include\n+\tBASIC_LDFLAGS += -L/usr/local/lib\n+\tINSTALL = ginstall\n+\tTAR = gtar\n+\tNO_STRCASESTR = YesPlease\n+\tNO_MEMMEM = YesPlease\n+endif\n+ifeq ($(uname_S),SCO_SV)\n+\tifeq ($(uname_R),3.2)\n+\t\tCFLAGS = -O2\n+\tendif\n+\tifeq ($(uname_R),5)\n+\t\tCC = cc\n+\t\tBASIC_CFLAGS += -Kthread\n+\tendif\n+\tNEEDS_SOCKET = YesPlease\n+\tNEEDS_NSL = YesPlease\n+\tNEEDS_SSL_WITH_CRYPTO = YesPlease\n+\tNEEDS_LIBICONV = YesPlease\n+\tSHELL_PATH = /usr/bin/bash\n+\tNO_IPV6 = YesPlease\n+\tNO_HSTRERROR = YesPlease\n+\tNO_MKSTEMPS = YesPlease\n+\tBASIC_CFLAGS += -I/usr/local/include\n+\tBASIC_LDFLAGS += -L/usr/local/lib\n+\tNO_STRCASESTR = YesPlease\n+\tNO_MEMMEM = YesPlease\n+\tINSTALL = ginstall\n+\tTAR = gtar\n+endif\n+ifeq ($(uname_S),Darwin)\n+\tNEEDS_CRYPTO_WITH_SSL = YesPlease\n+\tNEEDS_SSL_WITH_CRYPTO = YesPlease\n+\tNEEDS_LIBICONV = YesPlease\n+\tifeq ($(shell expr \"$(uname_R)\" : '[15678]\\.'),2)\n+\t\tOLD_ICONV = UnfortunatelyYes\n+\tendif\n+\tifeq ($(shell expr \"$(uname_R)\" : '[15]\\.'),2)\n+\t\tNO_STRLCPY = YesPlease\n+\tendif\n+\tNO_MEMMEM = YesPlease\n+\tUSE_ST_TIMESPEC = YesPlease\n+\tHAVE_DEV_TTY = YesPlease\n+\tCOMPAT_OBJS += compat/precompose_utf8.o\n+\tBASIC_CFLAGS += -DPRECOMPOSE_UNICODE\n+endif\n+ifeq ($(uname_S),SunOS)\n+\tNEEDS_SOCKET = YesPlease\n+\tNEEDS_NSL = YesPlease\n+\tSHELL_PATH = /bin/bash\n+\tSANE_TOOL_PATH = /usr/xpg6/bin:/usr/xpg4/bin\n+\tNO_STRCASESTR = YesPlease\n+\tNO_MEMMEM = YesPlease\n+\tNO_MKDTEMP = YesPlease\n+\tNO_MKSTEMPS = YesPlease\n+\tNO_REGEX = YesPlease\n+\tNO_FNMATCH_CASEFOLD = YesPlease\n+\tNO_MSGFMT_EXTENDED_OPTIONS = YesPlease\n+\tHAVE_DEV_TTY = YesPlease\n+\tifeq ($(uname_R),5.6)\n+\t\tSOCKLEN_T = int\n+\t\tNO_HSTRERROR = YesPlease\n+\t\tNO_IPV6 = YesPlease\n+\t\tNO_SOCKADDR_STORAGE = YesPlease\n+\t\tNO_UNSETENV = YesPlease\n+\t\tNO_SETENV = YesPlease\n+\t\tNO_STRLCPY = YesPlease\n+\t\tNO_STRTOUMAX = YesPlease\n+\t\tGIT_TEST_CMP = cmp\n+\tendif\n+\tifeq ($(uname_R),5.7)\n+\t\tNEEDS_RESOLV = YesPlease\n+\t\tNO_IPV6 = YesPlease\n+\t\tNO_SOCKADDR_STORAGE = YesPlease\n+\t\tNO_UNSETENV = YesPlease\n+\t\tNO_SETENV = YesPlease\n+\t\tNO_STRLCPY = YesPlease\n+\t\tNO_STRTOUMAX = YesPlease\n+\t\tGIT_TEST_CMP = cmp\n+\tendif\n+\tifeq ($(uname_R),5.8)\n+\t\tNO_UNSETENV = YesPlease\n+\t\tNO_SETENV = YesPlease\n+\t\tNO_STRTOUMAX = YesPlease\n+\t\tGIT_TEST_CMP = cmp\n+\tendif\n+\tifeq ($(uname_R),5.9)\n+\t\tNO_UNSETENV = YesPlease\n+\t\tNO_SETENV = YesPlease\n+\t\tNO_STRTOUMAX = YesPlease\n+\t\tGIT_TEST_CMP = cmp\n+\tendif\n+\tINSTALL = /usr/ucb/install\n+\tTAR = gtar\n+\tBASIC_CFLAGS += -D__EXTENSIONS__ -D__sun__ -DHAVE_ALLOCA_H\n+endif\n+ifeq ($(uname_O),Cygwin)\n+\tifeq ($(shell expr \"$(uname_R)\" : '1\\.[1-6]\\.'),4)\n+\t\tNO_D_TYPE_IN_DIRENT = YesPlease\n+\t\tNO_D_INO_IN_DIRENT = YesPlease\n+\t\tNO_STRCASESTR = YesPlease\n+\t\tNO_MEMMEM = YesPlease\n+\t\tNO_MKSTEMPS = YesPlease\n+\t\tNO_SYMLINK_HEAD = YesPlease\n+\t\tNO_IPV6 = YesPlease\n+\t\tOLD_ICONV = UnfortunatelyYes\n+\t\tCYGWIN_V15_WIN32API = YesPlease\n+\tendif\n+\tNO_THREAD_SAFE_PREAD = YesPlease\n+\tNEEDS_LIBICONV = YesPlease\n+\tNO_FAST_WORKING_DIRECTORY = UnfortunatelyYes\n+\tNO_TRUSTABLE_FILEMODE = UnfortunatelyYes\n+\tNO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease\n+\t# There are conflicting reports about this.\n+\t# On some boxes NO_MMAP is needed, and not so elsewhere.\n+\t# Try commenting this out if you suspect MMAP is more efficient\n+\tNO_MMAP = YesPlease\n+\tX = .exe\n+\tCOMPAT_OBJS += compat/cygwin.o\n+\tUNRELIABLE_FSTAT = UnfortunatelyYes\n+\tSPARSE_FLAGS = -isystem /usr/include/w32api -Wno-one-bit-signed-bitfield\n+endif\n+ifeq ($(uname_S),FreeBSD)\n+\tNEEDS_LIBICONV = YesPlease\n+\tOLD_ICONV = YesPlease\n+\tNO_MEMMEM = YesPlease\n+\tBASIC_CFLAGS += -I/usr/local/include\n+\tBASIC_LDFLAGS += -L/usr/local/lib\n+\tDIR_HAS_BSD_GROUP_SEMANTICS = YesPlease\n+\tUSE_ST_TIMESPEC = YesPlease\n+\tifeq ($(shell expr \"$(uname_R)\" : '4\\.'),2)\n+\t\tPTHREAD_LIBS = -pthread\n+\t\tNO_UINTMAX_T = YesPlease\n+\t\tNO_STRTOUMAX = YesPlease\n+\tendif\n+\tPYTHON_PATH = /usr/local/bin/python\n+\tHAVE_PATHS_H = YesPlease\n+endif\n+ifeq ($(uname_S),OpenBSD)\n+\tNO_STRCASESTR = YesPlease\n+\tNO_MEMMEM = YesPlease\n+\tUSE_ST_TIMESPEC = YesPlease\n+\tNEEDS_LIBICONV = YesPlease\n+\tBASIC_CFLAGS += -I/usr/local/include\n+\tBASIC_LDFLAGS += -L/usr/local/lib\n+\tHAVE_PATHS_H = YesPlease\n+endif\n+ifeq ($(uname_S),NetBSD)\n+\tifeq ($(shell expr \"$(uname_R)\" : '[01]\\.'),2)\n+\t\tNEEDS_LIBICONV = YesPlease\n+\tendif\n+\tBASIC_CFLAGS += -I/usr/pkg/include\n+\tBASIC_LDFLAGS += -L/usr/pkg/lib $(CC_LD_DYNPATH)/usr/pkg/lib\n+\tUSE_ST_TIMESPEC = YesPlease\n+\tNO_MKSTEMPS = YesPlease\n+\tHAVE_PATHS_H = YesPlease\n+endif\n+ifeq ($(uname_S),AIX)\n+\tDEFAULT_PAGER = more\n+\tNO_STRCASESTR = YesPlease\n+\tNO_MEMMEM = YesPlease\n+\tNO_MKDTEMP = YesPlease\n+\tNO_MKSTEMPS = YesPlease\n+\tNO_STRLCPY = YesPlease\n+\tNO_NSEC = YesPlease\n+\tFREAD_READS_DIRECTORIES = UnfortunatelyYes\n+\tINTERNAL_QSORT = UnfortunatelyYes\n+\tNEEDS_LIBICONV = YesPlease\n+\tBASIC_CFLAGS += -D_LARGE_FILES\n+\tifeq ($(shell expr \"$(uname_V)\" : '[1234]'),1)\n+\t\tNO_PTHREADS = YesPlease\n+\telse\n+\t\tPTHREAD_LIBS = -lpthread\n+\tendif\n+\tifeq ($(shell expr \"$(uname_V).$(uname_R)\" : '5\\.1'),3)\n+\t\tINLINE = ''\n+\tendif\n+\tGIT_TEST_CMP = cmp\n+endif\n+ifeq ($(uname_S),GNU)\n+\t# GNU/Hurd\n+\tNO_STRLCPY = YesPlease\n+\tNO_MKSTEMPS = YesPlease\n+\tHAVE_PATHS_H = YesPlease\n+\tLIBC_CONTAINS_LIBINTL = YesPlease\n+endif\n+ifeq ($(uname_S),IRIX)\n+\tNO_SETENV = YesPlease\n+\tNO_UNSETENV = YesPlease\n+\tNO_STRCASESTR = YesPlease\n+\tNO_MEMMEM = YesPlease\n+\tNO_MKSTEMPS = YesPlease\n+\tNO_MKDTEMP = YesPlease\n+\t# When compiled with the MIPSpro 7.4.4m compiler, and without pthreads\n+\t# (i.e. NO_PTHREADS is set), and _with_ MMAP (i.e. NO_MMAP is not set),\n+\t# git dies with a segmentation fault when trying to access the first\n+\t# entry of a reflog.  The conservative choice is made to always set\n+\t# NO_MMAP.  If you suspect that your compiler is not affected by this\n+\t# issue, comment out the NO_MMAP statement.\n+\tNO_MMAP = YesPlease\n+\tNO_REGEX = YesPlease\n+\tNO_FNMATCH_CASEFOLD = YesPlease\n+\tSNPRINTF_RETURNS_BOGUS = YesPlease\n+\tSHELL_PATH = /usr/gnu/bin/bash\n+\tNEEDS_LIBGEN = YesPlease\n+endif\n+ifeq ($(uname_S),IRIX64)\n+\tNO_SETENV = YesPlease\n+\tNO_UNSETENV = YesPlease\n+\tNO_STRCASESTR = YesPlease\n+\tNO_MEMMEM = YesPlease\n+\tNO_MKSTEMPS = YesPlease\n+\tNO_MKDTEMP = YesPlease\n+\t# When compiled with the MIPSpro 7.4.4m compiler, and without pthreads\n+\t# (i.e. NO_PTHREADS is set), and _with_ MMAP (i.e. NO_MMAP is not set),\n+\t# git dies with a segmentation fault when trying to access the first\n+\t# entry of a reflog.  The conservative choice is made to always set\n+\t# NO_MMAP.  If you suspect that your compiler is not affected by this\n+\t# issue, comment out the NO_MMAP statement.\n+\tNO_MMAP = YesPlease\n+\tNO_REGEX = YesPlease\n+\tNO_FNMATCH_CASEFOLD = YesPlease\n+\tSNPRINTF_RETURNS_BOGUS = YesPlease\n+\tSHELL_PATH = /usr/gnu/bin/bash\n+\tNEEDS_LIBGEN = YesPlease\n+endif\n+ifeq ($(uname_S),HP-UX)\n+\tINLINE = __inline\n+\tNO_IPV6 = YesPlease\n+\tNO_SETENV = YesPlease\n+\tNO_STRCASESTR = YesPlease\n+\tNO_MEMMEM = YesPlease\n+\tNO_MKSTEMPS = YesPlease\n+\tNO_STRLCPY = YesPlease\n+\tNO_MKDTEMP = YesPlease\n+\tNO_UNSETENV = YesPlease\n+\tNO_HSTRERROR = YesPlease\n+\tNO_SYS_SELECT_H = YesPlease\n+\tNO_FNMATCH_CASEFOLD = YesPlease\n+\tSNPRINTF_RETURNS_BOGUS = YesPlease\n+\tNO_NSEC = YesPlease\n+\tifeq ($(uname_R),B.11.00)\n+\t\tNO_INET_NTOP = YesPlease\n+\t\tNO_INET_PTON = YesPlease\n+\tendif\n+\tifeq ($(uname_R),B.10.20)\n+\t\t# Override HP-UX 11.x setting:\n+\t\tINLINE =\n+\t\tSOCKLEN_T = size_t\n+\t\tNO_PREAD = YesPlease\n+\t\tNO_INET_NTOP = YesPlease\n+\t\tNO_INET_PTON = YesPlease\n+\tendif\n+\tGIT_TEST_CMP = cmp\n+endif\n+ifeq ($(uname_S),Windows)\n+\tGIT_VERSION := $(GIT_VERSION).MSVC\n+\tpathsep = ;\n+\tNO_PREAD = YesPlease\n+\tNEEDS_CRYPTO_WITH_SSL = YesPlease\n+\tNO_LIBGEN_H = YesPlease\n+\tNO_POLL = YesPlease\n+\tNO_SYMLINK_HEAD = YesPlease\n+\tNO_IPV6 = YesPlease\n+\tNO_UNIX_SOCKETS = YesPlease\n+\tNO_SETENV = YesPlease\n+\tNO_UNSETENV = YesPlease\n+\tNO_STRCASESTR = YesPlease\n+\tNO_STRLCPY = YesPlease\n+\tNO_STRTOK_R = YesPlease\n+\tNO_FNMATCH = YesPlease\n+\tNO_MEMMEM = YesPlease\n+\t# NEEDS_LIBICONV = YesPlease\n+\tNO_ICONV = YesPlease\n+\tNO_STRTOUMAX = YesPlease\n+\tNO_STRTOULL = YesPlease\n+\tNO_MKDTEMP = YesPlease\n+\tNO_MKSTEMPS = YesPlease\n+\tSNPRINTF_RETURNS_BOGUS = YesPlease\n+\tNO_SVN_TESTS = YesPlease\n+\tNO_PERL_MAKEMAKER = YesPlease\n+\tRUNTIME_PREFIX = YesPlease\n+\tNO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease\n+\tNO_NSEC = YesPlease\n+\tUSE_WIN32_MMAP = YesPlease\n+\t# USE_NED_ALLOCATOR = YesPlease\n+\tUNRELIABLE_FSTAT = UnfortunatelyYes\n+\tOBJECT_CREATION_USES_RENAMES = UnfortunatelyNeedsTo\n+\tNO_REGEX = YesPlease\n+\tNO_CURL = YesPlease\n+\tNO_PYTHON = YesPlease\n+\tBLK_SHA1 = YesPlease\n+\tNO_POSIX_GOODIES = UnfortunatelyYes\n+\tNATIVE_CRLF = YesPlease\n+\tDEFAULT_HELP_FORMAT = html\n+\n+\tCC = compat/vcbuild/scripts/clink.pl\n+\tAR = compat/vcbuild/scripts/lib.pl\n+\tCFLAGS =\n+\tBASIC_CFLAGS = -nologo -I. -I../zlib -Icompat/vcbuild -Icompat/vcbuild/include -DWIN32 -D_CONSOLE -DHAVE_STRING_H -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE\n+\tCOMPAT_OBJS = compat/msvc.o compat/winansi.o \\\n+\t\tcompat/win32/pthread.o compat/win32/syslog.o \\\n+\t\tcompat/win32/dirent.o\n+\tCOMPAT_CFLAGS = -D__USE_MINGW_ACCESS -DNOGDI -DHAVE_STRING_H -DHAVE_ALLOCA_H -Icompat -Icompat/regex -Icompat/win32 -DSTRIP_EXTENSION=\\\".exe\\\"\n+\tBASIC_LDFLAGS = -IGNORE:4217 -IGNORE:4049 -NOLOGO -SUBSYSTEM:CONSOLE -NODEFAULTLIB:MSVCRT.lib\n+\tEXTLIBS = user32.lib advapi32.lib shell32.lib wininet.lib ws2_32.lib\n+\tPTHREAD_LIBS =\n+\tlib =\n+ifndef DEBUG\n+\tBASIC_CFLAGS += -GL -Os -MT\n+\tBASIC_LDFLAGS += -LTCG\n+\tAR += -LTCG\n+else\n+\tBASIC_CFLAGS += -Zi -MTd\n+endif\n+\tX = .exe\n+endif\n+ifeq ($(uname_S),Interix)\n+\tNO_INITGROUPS = YesPlease\n+\tNO_IPV6 = YesPlease\n+\tNO_MEMMEM = YesPlease\n+\tNO_MKDTEMP = YesPlease\n+\tNO_STRTOUMAX = YesPlease\n+\tNO_NSEC = YesPlease\n+\tNO_MKSTEMPS = YesPlease\n+\tifeq ($(uname_R),3.5)\n+\t\tNO_INET_NTOP = YesPlease\n+\t\tNO_INET_PTON = YesPlease\n+\t\tNO_SOCKADDR_STORAGE = YesPlease\n+\t\tNO_FNMATCH_CASEFOLD = YesPlease\n+\tendif\n+\tifeq ($(uname_R),5.2)\n+\t\tNO_INET_NTOP = YesPlease\n+\t\tNO_INET_PTON = YesPlease\n+\t\tNO_SOCKADDR_STORAGE = YesPlease\n+\t\tNO_FNMATCH_CASEFOLD = YesPlease\n+\tendif\n+endif\n+ifeq ($(uname_S),Minix)\n+\tNO_IPV6 = YesPlease\n+\tNO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease\n+\tNO_NSEC = YesPlease\n+\tNEEDS_LIBGEN =\n+\tNEEDS_CRYPTO_WITH_SSL = YesPlease\n+\tNEEDS_IDN_WITH_CURL = YesPlease\n+\tNEEDS_SSL_WITH_CURL = YesPlease\n+\tNEEDS_RESOLV =\n+\tNO_HSTRERROR = YesPlease\n+\tNO_MMAP = YesPlease\n+\tNO_CURL =\n+\tNO_EXPAT =\n+endif\n+ifeq ($(uname_S),NONSTOP_KERNEL)\n+\t# Needs some C99 features, \"inline\" is just one of them.\n+\t# INLINE='' would just replace one set of warnings with another and\n+\t# still not compile in c89 mode, due to non-const array initializations.\n+\tCC = cc -c99\n+\t# Disable all optimization, seems to result in bad code, with -O or -O2\n+\t# or even -O1 (default), /usr/local/libexec/git-core/git-pack-objects\n+\t# abends on \"git push\". Needs more investigation.\n+\tCFLAGS = -g -O0\n+\t# We'd want it to be here.\n+\tprefix = /usr/local\n+\t# Our's are in ${prefix}/bin (perl might also be in /usr/bin/perl).\n+\tPERL_PATH = ${prefix}/bin/perl\n+\tPYTHON_PATH = ${prefix}/bin/python\n+\n+\t# As detected by './configure'.\n+\t# Missdetected, hence commented out, see below.\n+\t#NO_CURL = YesPlease\n+\t# Added manually, see above.\n+\tNEEDS_SSL_WITH_CURL = YesPlease\n+\tHAVE_LIBCHARSET_H = YesPlease\n+\tNEEDS_LIBICONV = YesPlease\n+\tNEEDS_LIBINTL_BEFORE_LIBICONV = YesPlease\n+\tNO_SYS_SELECT_H = UnfortunatelyYes\n+\tNO_D_TYPE_IN_DIRENT = YesPlease\n+\tNO_HSTRERROR = YesPlease\n+\tNO_STRCASESTR = YesPlease\n+\tNO_FNMATCH_CASEFOLD = YesPlease\n+\tNO_MEMMEM = YesPlease\n+\tNO_STRLCPY = YesPlease\n+\tNO_SETENV = YesPlease\n+\tNO_UNSETENV = YesPlease\n+\tNO_MKDTEMP = YesPlease\n+\tNO_MKSTEMPS = YesPlease\n+\t# Currently libiconv-1.9.1.\n+\tOLD_ICONV = UnfortunatelyYes\n+\tNO_REGEX = YesPlease\n+\tNO_PTHREADS = UnfortunatelyYes\n+\n+\t# Not detected (nor checked for) by './configure'.\n+\t# We don't have SA_RESTART on NonStop, unfortunalety.\n+\tCOMPAT_CFLAGS += -DSA_RESTART=0\n+\t# Apparently needed in compat/fnmatch/fnmatch.c.\n+\tCOMPAT_CFLAGS += -DHAVE_STRING_H=1\n+\tNO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease\n+\tNO_NSEC = YesPlease\n+\tNO_PREAD = YesPlease\n+\tNO_MMAP = YesPlease\n+\tNO_POLL = YesPlease\n+\tNO_INTPTR_T = UnfortunatelyYes\n+\t# Bug report 10-120822-4477 submitted to HP NonStop development.\n+\tMKDIR_WO_TRAILING_SLASH = YesPlease\n+\t# RFE 10-120912-4693 submitted to HP NonStop development.\n+\tNO_SETITIMER = UnfortunatelyYes\n+\tSANE_TOOL_PATH = /usr/coreutils/bin:/usr/local/bin\n+\tSHELL_PATH = /usr/local/bin/bash\n+\t# as of H06.25/J06.14, we might better use this\n+\t#SHELL_PATH = /usr/coreutils/bin/bash\n+endif\n+ifneq (,$(findstring MINGW,$(uname_S)))\n+\tpathsep = ;\n+\tNO_PREAD = YesPlease\n+\tNEEDS_CRYPTO_WITH_SSL = YesPlease\n+\tNO_LIBGEN_H = YesPlease\n+\tNO_POLL = YesPlease\n+\tNO_SYMLINK_HEAD = YesPlease\n+\tNO_UNIX_SOCKETS = YesPlease\n+\tNO_SETENV = YesPlease\n+\tNO_UNSETENV = YesPlease\n+\tNO_STRCASESTR = YesPlease\n+\tNO_STRLCPY = YesPlease\n+\tNO_STRTOK_R = YesPlease\n+\tNO_FNMATCH = YesPlease\n+\tNO_MEMMEM = YesPlease\n+\tNEEDS_LIBICONV = YesPlease\n+\tOLD_ICONV = YesPlease\n+\tNO_STRTOUMAX = YesPlease\n+\tNO_MKDTEMP = YesPlease\n+\tNO_MKSTEMPS = YesPlease\n+\tNO_SVN_TESTS = YesPlease\n+\tNO_PERL_MAKEMAKER = YesPlease\n+\tRUNTIME_PREFIX = YesPlease\n+\tNO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease\n+\tNO_NSEC = YesPlease\n+\tUSE_WIN32_MMAP = YesPlease\n+\tUSE_NED_ALLOCATOR = YesPlease\n+\tUNRELIABLE_FSTAT = UnfortunatelyYes\n+\tOBJECT_CREATION_USES_RENAMES = UnfortunatelyNeedsTo\n+\tNO_REGEX = YesPlease\n+\tNO_PYTHON = YesPlease\n+\tBLK_SHA1 = YesPlease\n+\tETAGS_TARGET = ETAGS\n+\tNO_INET_PTON = YesPlease\n+\tNO_INET_NTOP = YesPlease\n+\tNO_POSIX_GOODIES = UnfortunatelyYes\n+\tCOMPAT_CFLAGS += -D__USE_MINGW_ACCESS -DNOGDI -Icompat -Icompat/win32\n+\tCOMPAT_CFLAGS += -DSTRIP_EXTENSION=\\\".exe\\\"\n+\tCOMPAT_OBJS += compat/mingw.o compat/winansi.o \\\n+\t\tcompat/win32/pthread.o compat/win32/syslog.o \\\n+\t\tcompat/win32/dirent.o\n+\tEXTLIBS += -lws2_32\n+\tPTHREAD_LIBS =\n+\tX = .exe\n+\tSPARSE_FLAGS = -Wno-one-bit-signed-bitfield\n+ifneq (,$(wildcard ../THIS_IS_MSYSGIT))\n+\thtmldir = doc/git/html/\n+\tprefix =\n+\tINSTALL = /bin/install\n+\tEXTLIBS += /mingw/lib/libz.a\n+\tNO_R_TO_GCC_LINKER = YesPlease\n+\tINTERNAL_QSORT = YesPlease\n+\tHAVE_LIBCHARSET_H = YesPlease\n+else\n+\tNO_CURL = YesPlease\n+endif\n+endif\n-- \n1.8.1.rc3.4.gf3a2f57\n"},{"id":"205956","messageId":"20130103210731.GB11783@sigill.intra.peff.net","threadId":"32518","inReplyTo":"20130103210541.GA11783@sigill.intra.peff.net","subject":"Re: [PATCH v2 0/2] DEFAULT_DOC_TARGET","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2013-01-03T21:07:31Z","receivedAt":"2013-01-03T21:07:31Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Thu, Jan 03, 2013 at 04:05:41PM -0500, Jeff King wrote:\n\n> On Thu, Jan 03, 2013 at 03:32:22PM -0500, Jeff King wrote:\n> \n> > I think the usefulness is that it can be set by default for a particular\n> > uname, so people on Windows can just type \"make install-doc\" without\n> > having to care about setting anything (though to be honest, I do not\n> > even know what they build by default; maybe they do build manpages).\n> > Except that in the original thread:\n> > \n> > >   http://thread.gmane.org/gmane.comp.version-control.git/207193/focus=207201\n> > \n> > it became clear that to do that we would also want to hoist the uname\n> > automagic defaults into their own file that could be read from\n> > Documentation/Makefile.\n> \n> IOW, this (on the current master), which I think is a nice cleanup\n> regardless of this series:\n> \n> -- >8 --\n> Subject: [PATCH] Makefile: hoist uname autodetection to config.mak.uname\n\nNot surprising for such a large refactoring, but this has conflicts with\nwhat's in next. Here's the patch to apply on top of the conflicted tree\nyou get from merging this with \"next\":\n\ndiff --cc Makefile\nindex 5e4ee47,f37fb24..0000000\n--- a/Makefile\n+++ b/Makefile\ndiff --git a/config.mak.uname b/config.mak.uname\nindex f9de18e..bea34f0 100644\n--- a/config.mak.uname\n+++ b/config.mak.uname\n@@ -425,6 +425,7 @@ ifeq ($(uname_S),NONSTOP_KERNEL)\n \t# Added manually, see above.\n \tNEEDS_SSL_WITH_CURL = YesPlease\n \tHAVE_LIBCHARSET_H = YesPlease\n+\tHAVE_STRINGS_H = YesPlease\n \tNEEDS_LIBICONV = YesPlease\n \tNEEDS_LIBINTL_BEFORE_LIBICONV = YesPlease\n \tNO_SYS_SELECT_H = UnfortunatelyYes\n@@ -520,3 +521,19 @@ endif\n \tNO_CURL = YesPlease\n endif\n endif\n+ifeq ($(uname_S),QNX)\n+\tCOMPAT_CFLAGS += -DSA_RESTART=0\n+\tHAVE_STRINGS_H = YesPlease\n+\tNEEDS_SOCKET = YesPlease\n+\tNO_FNMATCH_CASEFOLD = YesPlease\n+\tNO_GETPAGESIZE = YesPlease\n+\tNO_ICONV = YesPlease\n+\tNO_MEMMEM = YesPlease\n+\tNO_MKDTEMP = YesPlease\n+\tNO_MKSTEMPS = YesPlease\n+\tNO_NSEC = YesPlease\n+\tNO_PTHREADS = YesPlease\n+\tNO_R_TO_GCC_LINKER = YesPlease\n+\tNO_STRCASESTR = YesPlease\n+\tNO_STRLCPY = YesPlease\n+endif\n"},{"id":"205957","messageId":"7v4nixx61c.fsf@alter.siamese.dyndns.org","threadId":"32518","inReplyTo":"20130103210731.GB11783@sigill.intra.peff.net","subject":"Re: [PATCH v2 0/2] DEFAULT_DOC_TARGET","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-01-03T22:20:31Z","receivedAt":"2013-01-03T22:20:31Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jeff King <peff@peff.net> writes:\n\n> Not surprising for such a large refactoring, but this has conflicts with\n> what's in next. Here's the patch to apply on top of the conflicted tree\n> you get from merging this with \"next\":\n\nYeah, verifying the manual fixup is a bit tricky indeed.  The output from\n\n $ git blame -C HEAD^.. -- config.mak.uname | grep '^[^^]'\n\nshows only the first line of the resulting file, and the output from\n\n $ git blame --reverse -C HEAD^.. -- Makefile | grep '^^'\n\nshows only the three-line \"Platform specific tweaks\" comment, which\nwas replaced by your version in config.mak.uname, so nothing extra\nwas added and nothing important was lost between the two, it seems.\n\nThanks.\n"},{"id":"205958","messageId":"20130103222537.GA12128@sigill.intra.peff.net","threadId":"32518","inReplyTo":"7v4nixx61c.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH v2 0/2] DEFAULT_DOC_TARGET","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2013-01-03T22:25:37Z","receivedAt":"2013-01-03T22:25:37Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Thu, Jan 03, 2013 at 02:20:31PM -0800, Junio C Hamano wrote:\n\n> Jeff King <peff@peff.net> writes:\n> \n> > Not surprising for such a large refactoring, but this has conflicts with\n> > what's in next. Here's the patch to apply on top of the conflicted tree\n> > you get from merging this with \"next\":\n> \n> Yeah, verifying the manual fixup is a bit tricky indeed.  The output from\n> \n>  $ git blame -C HEAD^.. -- config.mak.uname | grep '^[^^]'\n> \n> shows only the first line of the resulting file, and the output from\n> \n>  $ git blame --reverse -C HEAD^.. -- Makefile | grep '^^'\n> \n> shows only the three-line \"Platform specific tweaks\" comment, which\n> was replaced by your version in config.mak.uname, so nothing extra\n> was added and nothing important was lost between the two, it seems.\n\nYeah, it's probably easier to do than verify. I knew that my patch was a\nstraight copy/paste move of the big if/else block, replacing it with the\ninclude. So the obvious resolution is to mechanically move the \"theirs\"\nblock from next in the same way. And then the resulting diff shows the\nfixup (which you can verify does not do anything fancy).\n\nIt's really the same logic that merge-recursive uses for full-file\nrenames, except that git is not smart enough to figure out that it was a\n500-line block that moved, not the whole file. It comes up rarely enough\nthat it is probably not worth trying to teach the merge machinery about\ncode block movement. But it would be cool. :)\n\n-Peff\n"}]}