From: Junio C Hamano <junkio@cox.net>
Date: Tue, 11 Apr 2006 18:52:36 +0000 (-0700)
Subject: Merge branch 'ds/index' into next
X-Git-Tag: v1.3.0-rc4~19
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b5b1442ac35706ce1e3daed407dd935f0e9dd796?ds=inline;hp=-c

Merge branch 'ds/index' into next

* ds/index:
Replace index() with strchr().
Solaris 9 also wants our own unsetenv/setenv.
Retire git-log.sh (take #3)
---

b5b1442ac35706ce1e3daed407dd935f0e9dd796
diff --combined Makefile
index 61dd8a20ae,50c5ccb9c3..e6ef41d702
--- a/Makefile
+++ b/Makefile
@@@ -170,7 -170,7 +170,7 @@@ PROGRAMS = 
  BUILT_INS = git-log$X
  
  # what 'all' will build and 'install' will install, in gitexecdir
- ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(BUILT_INS) $(SCRIPTS)
+ ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)
  
  # Backward compatibility -- to be removed after 1.0
  PROGRAMS += git-ssh-pull$X git-ssh-push$X
@@@ -196,12 -196,12 +196,12 @@@ LIB_H = 
  	blob.h cache.h commit.h csum-file.h delta.h \
  	diff.h object.h pack.h pkt-line.h quote.h refs.h \
  	run-command.h strbuf.h tag.h tree.h git-compat-util.h revision.h \
 -	tree-walk.h
 +	tree-walk.h log-tree.h
  
  DIFF_OBJS = \
  	diff.o diffcore-break.o diffcore-order.o \
  	diffcore-pickaxe.o diffcore-rename.o tree-diff.o combine-diff.o \
 -	diffcore-delta.o
 +	diffcore-delta.o log-tree.o
  
  LIB_OBJS = \
  	blob.o commit.o connect.o csum-file.o \
@@@ -248,6 -248,10 +248,10 @@@ ifeq ($(uname_S),SunOS
  		NO_UNSETENV = YesPlease
  		NO_SETENV = YesPlease
  	endif
+ 	ifeq ($(uname_R),5.9)
+ 		NO_UNSETENV = YesPlease
+ 		NO_SETENV = YesPlease
+ 	endif
  	INSTALL = ginstall
  	TAR = gtar
  	ALL_CFLAGS += -D__EXTENSIONS__
@@@ -450,7 -454,7 +454,7 @@@ LIB_OBJS += $(COMPAT_OBJS
  export prefix TAR INSTALL DESTDIR SHELL_PATH template_dir
  ### Build rules
  
- all: $(ALL_PROGRAMS) git$X gitk
+ all: $(ALL_PROGRAMS) $(BUILT_INS) git$X gitk
  
  all:
  	$(MAKE) -C templates
@@@ -617,6 -621,7 +621,7 @@@ install: al
  	$(MAKE) -C templates install
  	$(INSTALL) -d -m755 '$(DESTDIR_SQ)$(GIT_PYTHON_DIR_SQ)'
  	$(INSTALL) $(PYMODULES) '$(DESTDIR_SQ)$(GIT_PYTHON_DIR_SQ)'
+ 	$(foreach p,$(BUILT_INS), rm -f '$(DESTDIR_SQ)$(bindir_SQ)/$p' && ln '$(DESTDIR_SQ)$(bindir_SQ)/git$X' '$(DESTDIR_SQ)$(bindir_SQ)/$p' ;)
  
  install-doc:
  	$(MAKE) -C Documentation install