@matheusbsbs / matheus-bagliano / commits / 7f7e6eacf9
Fork 0

Install git builtins into gitexecdir rather than bindir.

Moving "git-cmd" commands out of the path and into a special git exec path, should include the builtins. [jc: fixed the case where bindir == gitexecdir - ln -f fails with a complaint that src and dst are the same, likewise for the fallback cp.] Signed-off-by: Junio C Hamano <junkio@cox.net>

Sean committed May 22, 2006 at 00:42 UTC 7f7e6eacf999cb53771426e561589f721e6c9974
1 file changed +8 -1
Makefile
+8 -1
@@ -627,7 +627,14 @@ install: all
627 $(MAKE) -C templates install
628 $(INSTALL) -d -m755 '$(DESTDIR_SQ)$(GIT_PYTHON_DIR_SQ)'
629 $(INSTALL) $(PYMODULES) '$(DESTDIR_SQ)$(GIT_PYTHON_DIR_SQ)'
630 - $(foreach p,$(BUILT_INS), rm -f '$(DESTDIR_SQ)$(bindir_SQ)/$p' && ln '$(DESTDIR_SQ)$(bindir_SQ)/git$X' '$(DESTDIR_SQ)$(bindir_SQ)/$p' ;)
630 + if test 'z$(bindir_SQ)' != 'z$(gitexecdir_SQ)'; \
631 + then \
632 + ln -f '$(DESTDIR_SQ)$(bindir_SQ)/git$X' \
633 + '$(DESTDIR_SQ)$(gitexecdir_SQ)/git$X' || \
634 + cp '$(DESTDIR_SQ)$(bindir_SQ)/git$X' \
635 + '$(DESTDIR_SQ)$(gitexecdir_SQ)/git$X'; \
636 + fi
637 + $(foreach p,$(BUILT_INS), rm -f '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' && ln '$(DESTDIR_SQ)$(gitexecdir_SQ)/git$X' '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' ;)
638
639 install-doc:
640 $(MAKE) -C Documentation install