diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-07-17 03:42:46 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-07-17 03:42:46 +0300 |
commit | bc34e5227b683c5bb0a85211354f5eb3ccd8cc19 (patch) | |
tree | 55c3396e3dfff93f2122eddbf1c66703bd59da1e /config.mak.uname | |
parent | 508416d95ca2520b35844af4abf1a0a07c533bda (diff) | |
parent | e355307692f49f2f02275b083e91532efed9f7c0 (diff) |
Merge branch 'js/gfw-system-config-loc-fix'
Update the location of system-side configuration file on Windows.
* js/gfw-system-config-loc-fix:
config: normalize the path of the system gitconfig
cmake(windows): set correct path to the system Git config
mingw: move Git for Windows' system config where users expect it
Diffstat (limited to 'config.mak.uname')
-rw-r--r-- | config.mak.uname | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/config.mak.uname b/config.mak.uname index cb443b4e02..0587a23c1c 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -437,6 +437,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 @@ -671,6 +676,11 @@ else 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 |