On Thu, Jan 03, 2013 at 04:05:41PM -0500, Jeff King wrote: > On Thu, Jan 03, 2013 at 03:32:22PM -0500, Jeff King wrote: > > > I think the usefulness is that it can be set by default for a particular > > uname, so people on Windows can just type "make install-doc" without > > having to care about setting anything (though to be honest, I do not > > even know what they build by default; maybe they do build manpages). > > Except that in the original thread: > > > > > http://thread.gmane.org/gmane.comp.version-control.git/207193/focus=207201 > > > > it became clear that to do that we would also want to hoist the uname > > automagic defaults into their own file that could be read from > > Documentation/Makefile. > > IOW, this (on the current master), which I think is a nice cleanup > regardless of this series: > > -- >8 -- > Subject: [PATCH] Makefile: hoist uname autodetection to config.mak.uname Not surprising for such a large refactoring, but this has conflicts with what's in next. Here's the patch to apply on top of the conflicted tree you get from merging this with "next": diff --cc Makefile index 5e4ee47,f37fb24..0000000 --- a/Makefile +++ b/Makefile diff --git a/config.mak.uname b/config.mak.uname index f9de18e..bea34f0 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -425,6 +425,7 @@ ifeq ($(uname_S),NONSTOP_KERNEL) # Added manually, see above. NEEDS_SSL_WITH_CURL = YesPlease HAVE_LIBCHARSET_H = YesPlease + HAVE_STRINGS_H = YesPlease NEEDS_LIBICONV = YesPlease NEEDS_LIBINTL_BEFORE_LIBICONV = YesPlease NO_SYS_SELECT_H = UnfortunatelyYes @@ -520,3 +521,19 @@ endif NO_CURL = YesPlease endif endif +ifeq ($(uname_S),QNX) + COMPAT_CFLAGS += -DSA_RESTART=0 + HAVE_STRINGS_H = YesPlease + NEEDS_SOCKET = YesPlease + NO_FNMATCH_CASEFOLD = YesPlease + NO_GETPAGESIZE = YesPlease + NO_ICONV = YesPlease + NO_MEMMEM = YesPlease + NO_MKDTEMP = YesPlease + NO_MKSTEMPS = YesPlease + NO_NSEC = YesPlease + NO_PTHREADS = YesPlease + NO_R_TO_GCC_LINKER = YesPlease + NO_STRCASESTR = YesPlease + NO_STRLCPY = YesPlease +endif -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html