From: Junio C Hamano <junkio@cox.net>
Date: Mon, 10 Oct 2005 02:17:43 +0000 (-0700)
Subject: Merge branch 'fixes'
X-Git-Tag: v0.99.8c~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2af60a0521a8d0514e8bb1ca371cc9d502ea1c58?ds=inline;hp=-c

Merge branch 'fixes'
---

2af60a0521a8d0514e8bb1ca371cc9d502ea1c58
diff --combined Makefile
index 60763c4a6e,b8ca504f09..747b06447a
--- a/Makefile
+++ b/Makefile
@@@ -48,7 -48,7 +48,7 @@@
  
  # DEFINES += -DUSE_STDEV
  
 -GIT_VERSION = 0.99.8
 +GIT_VERSION = 0.99.8b
  
  CFLAGS = -g -O2 -Wall
  ALL_CFLAGS = $(CFLAGS) $(PLATFORM_DEFINES) $(DEFINES)
@@@ -246,7 -246,7 +246,7 @@@ ifdef NEEDS_NS
  	SIMPLE_LIB += -lnsl
  endif
  ifdef NO_STRCASESTR
- 	DEFINES += -Dstrcasestr=gitstrcasestr
+ 	DEFINES += -Dstrcasestr=gitstrcasestr -DNO_STRCASESTR=1
  	LIB_OBJS += compat/strcasestr.o
  endif