summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 611c7f6)
raw | patch | inline | side by side (parent: 611c7f6)
author | Junio C Hamano <gitster@pobox.com> | |
Fri, 7 Aug 2009 19:09:29 +0000 (12:09 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Fri, 7 Aug 2009 19:20:29 +0000 (12:20 -0700) |
Instead of installing/copying three programs separately, just install one
and try to make hardlinks to the other two.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
and try to make hardlinks to the other two.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Makefile | patch | blob | history |
diff --git a/Makefile b/Makefile
index 5f4d0c95e58955711038e329503cc6cbfeeb3568..438cffb44260cb5bd6265992b6833336c4e27bdc 100644 (file)
--- a/Makefile
+++ b/Makefile
BUILT_INS += git-status$X
BUILT_INS += git-whatchanged$X
-# what 'all' will build and 'install' will install, in gitexecdir
+# what 'all' will build and 'install' will install in gitexecdir,
+# excluding programs for built-in commands
ALL_PROGRAMS = $(PROGRAMS) $(SCRIPTS)
# what 'all' will build but not install in gitexecdir
install: all
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
- $(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
+ $(INSTALL) $(filter-out $(CURL_SYNONYMS), $(ALL_PROGRAMS)) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
$(INSTALL) git$X git-upload-pack$X git-receive-pack$X git-upload-archive$X git-shell$X git-cvsserver '$(DESTDIR_SQ)$(bindir_SQ)'
$(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install
ifndef NO_PERL
ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \
cp "$$execdir/git$X" "$$execdir/$$p" || exit; \
done; } && \
+ { for p in $(CURL_SYNONYMS); do \
+ $(RM) "$$execdir/$$p" && \
+ ln "$$execdir/git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \
+ ln -s "git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \
+ cp "$$execdir/git-remote-http$X" "$$execdir/$$p" || exit; \
+ done; } && \
./check_bindir "z$$bindir" "z$$execdir" "$$bindir/git-add$X"
install-doc: