Merge branch 'fixes'

diff --git a/Makefile b/Makefile
index a201187395d0102ab8b807d9ae78cb794c1df99a..ac384c7dc484387b5f9fc6a65ef6cdbf2343cf9e 100644 (file)
--- 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