summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-10-09 19:16:33 -0700
committerJunio C Hamano <junkio@cox.net>2005-10-09 19:16:33 -0700
commitd5b0c9ea178dab3599674ccff50645c0464b8c31 (patch)
treea35b27b04d18022ea4731941ea2a1bedce998092 /Makefile
parentf8e2c54c9a17af3319e96db1d9e97ace36ae6831 (diff)
parentfb8024b414b417d85ce215eba3dd23c188500c15 (diff)
downloadgit-d5b0c9ea178dab3599674ccff50645c0464b8c31.tar.gz
Merge branch 'fixes'
with minor hand resolving on git-tag. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index a201187395..ac384c7dc4 100644
--- a/Makefile
+++ b/Makefile
@@ -265,7 +265,7 @@ ifdef NEEDS_NSL
SIMPLE_LIB += -lnsl
endif
ifdef NO_STRCASESTR
- DEFINES += -Dstrcasestr=gitstrcasestr
+ DEFINES += -Dstrcasestr=gitstrcasestr -DNO_STRCASESTR=1
LIB_OBJS += compat/strcasestr.o
endif
ifdef NO_MMAP