summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-06-20 23:02:14 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-06-20 23:02:14 (GMT)
commit6aeb74ec89272be317f66869fde7c5144d528d5e (patch)
tree99f6797f536556fa2741fbe202ad6345704755fd /Makefile
parentfb7dfaa710da6f9ebb854f70ffc1c78668a1e70c (diff)
parent4917e1edabd6989e229e1a751b4062708cfd6f8e (diff)
downloadgit-6aeb74ec89272be317f66869fde7c5144d528d5e.zip
git-6aeb74ec89272be317f66869fde7c5144d528d5e.tar.gz
git-6aeb74ec89272be317f66869fde7c5144d528d5e.tar.bz2
Merge branch 'nd/make-wildmatch-default'
* nd/make-wildmatch-default: Makefile: promote wildmatch to be the default fnmatch implementation
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 03524d0..17c7ecb 100644
--- a/Makefile
+++ b/Makefile
@@ -109,7 +109,7 @@ all::
# Define NO_FNMATCH_CASEFOLD if your fnmatch function doesn't have the
# FNM_CASEFOLD GNU extension.
#
-# Define USE_WILDMATCH if you want to use Git's wildmatch
+# Define NO_WILDMATCH if you do not want to use Git's wildmatch
# implementation as fnmatch
#
# Define NO_GECOS_IN_PWENT if you don't have pw_gecos in struct passwd
@@ -1278,7 +1278,7 @@ ifdef NO_FNMATCH_CASEFOLD
COMPAT_OBJS += compat/fnmatch/fnmatch.o
endif
endif
-ifdef USE_WILDMATCH
+ifndef NO_WILDMATCH
COMPAT_CFLAGS += -DUSE_WILDMATCH
endif
ifdef NO_SETENV