Merge branch 'master' of .
[git.git] / Makefile
index 57d4f11..033c96e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -57,7 +57,7 @@ SPARSE_FLAGS = -D__BIG_ENDIAN__ -D__powerpc__
 
 
 
-SCRIPTS=git git-apply-patch-script git-merge-one-file-script git-prune-script \
+SCRIPTS=git git-merge-one-file-script git-prune-script \
        git-pull-script git-tag-script git-resolve-script git-whatchanged \
        git-fetch-script git-status-script git-commit-script \
        git-log-script git-shortlog git-cvsimport-script git-diff-script \
@@ -65,12 +65,13 @@ SCRIPTS=git git-apply-patch-script git-merge-one-file-script git-prune-script \
        gitk git-cherry git-rebase-script git-relink-script git-repack-script \
        git-format-patch-script git-sh-setup-script git-push-script \
        git-branch-script git-parse-remote-script git-verify-tag-script \
-       git-ls-remote-script git-clone-dumb-http git-rename-script \
+       git-ls-remote-script git-rename-script \
        git-request-pull-script git-bisect-script
 
 SCRIPTS += git-count-objects-script
 SCRIPTS += git-revert-script
 SCRIPTS += git-octopus-script
+SCRIPTS += git-archimport-script
 
 PROG=   git-update-cache git-diff-files git-init-db git-write-tree \
        git-read-tree git-commit-tree git-cat-file git-fsck-cache \
@@ -215,6 +216,7 @@ check:
 install: $(PROG) $(SCRIPTS)
        $(INSTALL) -m755 -d $(DESTDIR)$(bindir)
        $(INSTALL) $(PROG) $(SCRIPTS) $(DESTDIR)$(bindir)
+       $(INSTALL) git-revert-script $(DESTDIR)$(bindir)/git-cherry-pick-script
        $(MAKE) -C templates install
        $(MAKE) -C tools install