projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-checkout-index: documentation updates.
[git.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
79cafd7
..
e67d0e7
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-48,7
+48,7
@@
# DEFINES += -DUSE_STDEV
# DEFINES += -DUSE_STDEV
-GIT_VERSION = 0.99.
7.GIT
+GIT_VERSION = 0.99.
8
CFLAGS = -g -O2 -Wall
ALL_CFLAGS = $(CFLAGS) $(PLATFORM_DEFINES) $(DEFINES)
CFLAGS = -g -O2 -Wall
ALL_CFLAGS = $(CFLAGS) $(PLATFORM_DEFINES) $(DEFINES)
@@
-122,6
+122,8
@@
PROGRAMS = \
# Backward compatibility -- to be removed after 1.0
PROGRAMS += git-ssh-pull git-ssh-push
# Backward compatibility -- to be removed after 1.0
PROGRAMS += git-ssh-pull git-ssh-push
+GIT_LIST_TWEAK =
+
PYMODULES = \
gitMergeCommon.py
PYMODULES = \
gitMergeCommon.py
@@
-131,6
+133,8
@@
endif
ifdef WITH_SEND_EMAIL
SCRIPT_PERL += git-send-email.perl
ifdef WITH_SEND_EMAIL
SCRIPT_PERL += git-send-email.perl
+else
+ GIT_LIST_TWEAK += -e '/^send-email$$/d'
endif
LIB_FILE=libgit.a
endif
LIB_FILE=libgit.a
@@
-176,6
+180,7
@@
ifneq (,$(findstring arm,$(shell uname -m)))
ARM_SHA1 = YesPlease
endif
ifeq ($(shell uname -s),OpenBSD)
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
NEEDS_LIBICONV = YesPlease
PLATFORM_DEFINES += -I/usr/local/include -L/usr/local/lib
endif
@@
-242,7
+247,7
@@
ifdef NEEDS_NSL
SIMPLE_LIB += -lnsl
endif
ifdef NO_STRCASESTR
SIMPLE_LIB += -lnsl
endif
ifdef NO_STRCASESTR
- DEFINES += -Dstrcasestr=gitstrcasestr
+ DEFINES += -Dstrcasestr=gitstrcasestr
-DNO_STRCASESTR=1
LIB_OBJS += compat/strcasestr.o
endif
LIB_OBJS += compat/strcasestr.o
endif
@@
-282,7
+287,8
@@
all:
git: git.sh Makefile
rm -f $@+ $@
sed -e '1s|#!.*/sh|#!$(SHELL_PATH)|' \
git: git.sh Makefile
rm -f $@+ $@
sed -e '1s|#!.*/sh|#!$(SHELL_PATH)|' \
- -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' <$@.sh >$@+
+ -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
+ $(GIT_LIST_TWEAK) <$@.sh >$@+
chmod +x $@+
mv $@+ $@
chmod +x $@+
mv $@+ $@