Merge branch 'jk/apply-binary-hunk-parsing-fix'

[thirdparty/git.git] / config.mak.uname

diff --git a/config.mak.uname b/config.mak.uname
index cb443b4e023adb9957b17714ed4c72bc21dc8744..76516aaa9a5d565e3a55e5e12c90329e0525744c 100644 (file)
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -58,6 +58,8 @@ ifeq ($(uname_S),Linux)
        FREAD_READS_DIRECTORIES = UnfortunatelyYes
        BASIC_CFLAGS += -DHAVE_SYSINFO
        PROCFS_EXECUTABLE_PATH = /proc/self/exe
+       HAVE_PLATFORM_PROCINFO = YesPlease
+       COMPAT_OBJS += compat/linux/procinfo.o
 endif
 ifeq ($(uname_S),GNU/kFreeBSD)
        HAVE_ALLOCA_H = YesPlease
@@ -437,6 +439,11 @@ ifeq ($(uname_S),Windows)
        NO_POSIX_GOODIES = UnfortunatelyYes
        NATIVE_CRLF = YesPlease
        DEFAULT_HELP_FORMAT = html
+ifeq (/mingw64,$(subst 32,64,$(prefix)))
+       # Move system config into top-level /etc/
+       ETC_GITCONFIG = ../etc/gitconfig
+       ETC_GITATTRIBUTES = ../etc/gitattributes
+endif
 
        CC = compat/vcbuild/scripts/clink.pl
        AR = compat/vcbuild/scripts/lib.pl
@@ -612,6 +619,7 @@ ifneq (,$(findstring MINGW,$(uname_S)))
        ETAGS_TARGET = ETAGS
        NO_POSIX_GOODIES = UnfortunatelyYes
        DEFAULT_HELP_FORMAT = html
+       HAVE_PLATFORM_PROCINFO = YesPlease
        BASIC_LDFLAGS += -municode
        COMPAT_CFLAGS += -DNOGDI -Icompat -Icompat/win32
        COMPAT_CFLAGS += -DSTRIP_EXTENSION=\".exe\"
@@ -668,9 +676,14 @@ else
                HAVE_LIBCHARSET_H = YesPlease
                NO_GETTEXT =
                USE_GETTEXT_SCHEME = fallthrough
-               USE_LIBPCRE= YesPlease
+               USE_LIBPCRE = YesPlease
                NO_CURL =
                USE_NED_ALLOCATOR = YesPlease
+               ifeq (/mingw64,$(subst 32,64,$(prefix)))
+                       # Move system config into top-level /etc/
+                       ETC_GITCONFIG = ../etc/gitconfig
+                       ETC_GITATTRIBUTES = ../etc/gitattributes
+               endif
        else
                COMPAT_CFLAGS += -D__USE_MINGW_ANSI_STDIO
                NO_CURL = YesPlease