From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 1 Jul 2008 22:21:40 +0000 (-0700)
Subject: Merge branch 'nd/dashless'
X-Git-Tag: v1.6.0-rc0~184
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/605acb6d0dd9dba21f2b11dfe8772d7718b881a6?ds=inline;hp=-c

Merge branch 'nd/dashless'

* nd/dashless:
Keep some git-* programs in $(bindir)
Move all dashed-form commands to libexecdir
---

605acb6d0dd9dba21f2b11dfe8772d7718b881a6
diff --combined Makefile
index bf77292f1c,8534af2279..ba16f26793
--- a/Makefile
+++ b/Makefile
@@@ -174,7 -174,7 +174,7 @@@ prefix = $(HOME
  bindir = $(prefix)/bin
  mandir = $(prefix)/share/man
  infodir = $(prefix)/share/info
- gitexecdir = $(bindir)
+ gitexecdir = $(prefix)/libexec/git-core
  sharedir = $(prefix)/share
  template_dir = $(sharedir)/git-core/templates
  htmldir=$(sharedir)/doc/git-doc
@@@ -354,7 -354,6 +354,7 @@@ LIB_H += log-tree.
  LIB_H += mailmap.h
  LIB_H += object.h
  LIB_H += pack.h
 +LIB_H += pack-refs.h
  LIB_H += pack-revindex.h
  LIB_H += parse-options.h
  LIB_H += patch-ids.h
@@@ -378,7 -377,6 +378,7 @@@ LIB_H += unpack-trees.
  LIB_H += utf8.h
  LIB_H += wt-status.h
  
 +LIB_OBJS += abspath.o
  LIB_OBJS += alias.o
  LIB_OBJS += alloc.o
  LIB_OBJS += archive.o
@@@ -431,7 -429,6 +431,7 @@@ LIB_OBJS += merge-file.
  LIB_OBJS += name-hash.o
  LIB_OBJS += object.o
  LIB_OBJS += pack-check.o
 +LIB_OBJS += pack-refs.o
  LIB_OBJS += pack-revindex.o
  LIB_OBJS += pack-write.o
  LIB_OBJS += pager.o
@@@ -470,7 -467,6 +470,7 @@@ LIB_OBJS += unpack-trees.
  LIB_OBJS += usage.o
  LIB_OBJS += utf8.o
  LIB_OBJS += walker.o
 +LIB_OBJS += wrapper.o
  LIB_OBJS += write_or_die.o
  LIB_OBJS += ws.o
  LIB_OBJS += wt-status.o
@@@ -1272,7 -1268,7 +1272,7 @@@ install: al
  	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'
  	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(gitexecdir_SQ)'
  	$(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexecdir_SQ)'
- 	$(INSTALL) git$X '$(DESTDIR_SQ)$(bindir_SQ)'
+ 	$(INSTALL) git$X git-upload-pack$X git-receive-pack$X git-upload-archive$X '$(DESTDIR_SQ)$(bindir_SQ)'
  	$(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install
  	$(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install
  ifndef NO_TCLTK
@@@ -1290,13 -1286,11 +1290,14 @@@ endi
  ifneq (,$X)
  	$(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) git$X)), $(RM) '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p';)
  endif
+ 	./check_bindir 'z$(bindir_SQ)' 'z$(gitexecdir_SQ)' '$(DESTDIR_SQ)$(bindir_SQ)/git-shell$X'
  
  install-doc:
  	$(MAKE) -C Documentation install
  
 +install-html:
 +	$(MAKE) -C Documentation install-html
 +
  install-info:
  	$(MAKE) -C Documentation install-info