Fix cvsimport warning when called without --no-cvs-direct

diff --git a/Makefile b/Makefile
index f7af3e452c03fbd09c991ed69c034db6082caaba..1e1c1b27db7c8cfe0eefe442721d021bf28624c9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -48,7 +48,7 @@
 
 # DEFINES += -DUSE_STDEV
 
-GIT_VERSION = 0.99.8a
+GIT_VERSION = 0.99.8e
 
 CFLAGS = -g -O2 -Wall
 ALL_CFLAGS = $(CFLAGS) $(PLATFORM_DEFINES) $(DEFINES)
@@ -116,7 +116,7 @@ PROGRAMS = \
        git-ssh-upload git-tar-tree git-unpack-file \
        git-unpack-objects git-update-index git-update-server-info \
        git-upload-pack git-verify-pack git-write-tree \
-       git-update-ref git-symbolic-ref \
+       git-update-ref git-symbolic-ref git-check-ref-format \
        $(SIMPLE_PROGRAMS)
 
 # Backward compatibility -- to be removed after 1.0
@@ -180,6 +180,7 @@ ifneq (,$(findstring arm,$(shell uname -m)))
        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
@@ -246,7 +247,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