]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'js/config-mak-windows-pcre-fix'
authorJunio C Hamano <gitster@pobox.com>
Sat, 17 Jul 2021 00:42:47 +0000 (17:42 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 17 Jul 2021 00:42:47 +0000 (17:42 -0700)
Whitespace fix.

* js/config-mak-windows-pcre-fix:
  config.mak.uname: PCRE1 cleanup

1  2 
config.mak.uname

index 0587a23c1cb1a29a96e03342a14488c383a4ce88,e8ceaed3d3edb30ef190546b5a6782891db50756..69413fb3dc0ad860a16ea044df2e90212d9ea522
@@@ -673,14 -668,9 +673,14 @@@ els
                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