diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-07-01 22:21:40 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-01 22:21:40 (GMT) |
| commit | 605acb6d0dd9dba21f2b11dfe8772d7718b881a6 (patch) | |
| tree | 71c8237ee5d89c6023a67def3a882b482c6a88fd /Makefile | |
| parent | 66037991d3fd2ac7e699c7bd21d939b9e397f6a4 (diff) | |
| parent | 98db51e624f45bcfae0a183ce86e0c1f1814269e (diff) | |
| download | git-605acb6d0dd9dba21f2b11dfe8772d7718b881a6.zip git-605acb6d0dd9dba21f2b11dfe8772d7718b881a6.tar.gz git-605acb6d0dd9dba21f2b11dfe8772d7718b881a6.tar.bz2 | |
Merge branch 'nd/dashless'
* nd/dashless:
Keep some git-* programs in $(bindir)
Move all dashed-form commands to libexecdir
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -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 @@ -1272,7 +1272,7 @@ install: all $(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,6 +1290,7 @@ endif 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 |