Andrew's git / gitweb.git / diff
?
Merge branch 'fixes'
authorJunio C Hamano <junkio@cox.net>
Mon, 10 Oct 2005 02:17:43 +0000 (19:17 -0700)
committerJunio C Hamano <junkio@cox.net>
Mon, 10 Oct 2005 02:17:43 +0000 (19:17 -0700)
1  2 
Makefile patch | diff1 | diff2 | blob | history
diff --combined Makefile
index 60763c4a6ea8bb2f987b17fcdfac76af9dc71be9,b8ca504f095a68ef929af92127b1197c53120a6b..747b06447accee7f277346cc058429ad30d57892
--- 1/Makefile
--- 2/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