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

Merge branch 'fixes'
---

e858862fd967f5d51b0730f8750a49c6acedea3e
diff --combined Makefile
index 6843366994,e67d0e7822..39d13613ad
--- a/Makefile
+++ b/Makefile
@@@ -48,7 -48,7 +48,7 @@@
  
  # DEFINES += -DUSE_STDEV
  
 -GIT_VERSION = 0.99.8
 +GIT_VERSION = 0.99.8c
  
  CFLAGS = -g -O2 -Wall
  ALL_CFLAGS = $(CFLAGS) $(PLATFORM_DEFINES) $(DEFINES)
@@@ -180,6 -180,7 +180,7 @@@ ifneq (,$(findstring arm,$(shell uname 
  	ARM_SHA1 = YesPlease
  endif
  ifeq ($(shell uname -s),OpenBSD)
+ 	NO_STRCASESTR = YesPlease
  	NEEDS_LIBICONV = YesPlease
  	PLATFORM_DEFINES += -I/usr/local/include -L/usr/local/lib
  endif