X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Makefile;h=9aa0c9a4f1423ab50ee02165987b553b0f8de641;hb=b893f09104ee5f1d8710dfe17cdf1cbac995f17a;hp=3e9b40621d748975f51344d216da7e42c03c6497;hpb=b05701c5b4c7983ef04d8c286c65089596553bd6;p=git.git

diff --git a/Makefile b/Makefile
index 3e9b4062..9aa0c9a4 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@
 
 # DEFINES += -DUSE_STDEV
 
-GIT_VERSION = 0.99.4
+GIT_VERSION = 0.99.5
 
 CFLAGS = -g -O2 -Wall
 ALL_CFLAGS = $(CFLAGS) $(DEFINES)
@@ -40,7 +40,7 @@ ALL_CFLAGS = $(CFLAGS) $(DEFINES)
 prefix = $(HOME)
 bindir = $(prefix)/bin
 template_dir = $(prefix)/share/git-core/templates/
-# dest=
+# DESTDIR=
 
 CC = gcc
 AR = ar
@@ -57,20 +57,21 @@ 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 \
 	git-reset-script git-add-script git-checkout-script git-clone-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 git-verify-tag-script \
-	git-ls-remote-script git-clone-dumb-http git-rename-script \
+	git-branch-script git-parse-remote-script git-verify-tag-script \
+	git-ls-remote-script git-rename-script \
 	git-request-pull-script git-bisect-script
 
 SCRIPTS += git-count-objects-script
-# SCRIPTS += git-send-email-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 \
@@ -83,11 +84,15 @@ PROG=   git-update-cache git-diff-files git-init-db git-write-tree \
 	git-diff-stages git-rev-parse git-patch-id git-pack-objects \
 	git-unpack-objects git-verify-pack git-receive-pack git-send-pack \
 	git-prune-packed git-fetch-pack git-upload-pack git-clone-pack \
-	git-show-index git-daemon git-var git-peek-remote \
+	git-show-index git-daemon git-var git-peek-remote git-show-branch \
 	git-update-server-info git-show-rev-cache git-build-rev-cache
 
+ifdef WITH_SEND_EMAIL
+SCRIPTS += git-send-email-script
+endif
+
 ifndef NO_CURL
-PROG+= git-http-pull
+	PROG+= git-http-pull
 endif
 
 LIB_FILE=libgit.a
@@ -96,7 +101,7 @@ LIB_H=cache.h object.h blob.h tree.h commit.h tag.h delta.h epoch.h csum-file.h
 LIB_OBJS=read-cache.o sha1_file.o usage.o object.o commit.o tree.o blob.o \
 	 tag.o date.o index.o diff-delta.o patch-delta.o entry.o path.o \
 	 refs.o csum-file.o pack-check.o pkt-line.o connect.o ident.o \
-	 sha1_name.o
+	 sha1_name.o setup.o
 
 LIB_H += rev-cache.h
 LIB_OBJS += rev-cache.o
@@ -130,20 +135,20 @@ else
 	OPENSSL_LIBSSL=
 endif
 ifdef MOZILLA_SHA1
-  SHA1_HEADER="mozilla-sha1/sha1.h"
-  LIB_OBJS += mozilla-sha1/sha1.o
-else
-ifdef PPC_SHA1
-  SHA1_HEADER="ppc/sha1.h"
-  LIB_OBJS += ppc/sha1.o ppc/sha1ppc.o
-else
-  SHA1_HEADER=<openssl/sha.h>
-ifeq ($(shell uname -s),Darwin)
-  LIBS += -lcrypto -lssl
+	SHA1_HEADER="mozilla-sha1/sha1.h"
+	LIB_OBJS += mozilla-sha1/sha1.o
 else
-  LIBS += -lcrypto
-endif
-endif
+	ifdef PPC_SHA1
+		SHA1_HEADER="ppc/sha1.h"
+		LIB_OBJS += ppc/sha1.o ppc/sha1ppc.o
+	else
+		SHA1_HEADER=<openssl/sha.h>
+		ifeq ($(shell uname -s),Darwin)
+			LIBS += -lcrypto -lssl
+		else
+			LIBS += -lcrypto
+		endif
+	endif
 endif
 
 DEFINES += '-DSHA1_HEADER=$(SHA1_HEADER)'
@@ -209,11 +214,10 @@ check:
 ### Installation rules
 
 install: $(PROG) $(SCRIPTS)
-	$(INSTALL) -m755 -d $(dest)$(bindir)
-	$(INSTALL) $(PROG) $(SCRIPTS) $(dest)$(bindir)
+	$(INSTALL) -m755 -d $(DESTDIR)$(bindir)
+	$(INSTALL) $(PROG) $(SCRIPTS) $(DESTDIR)$(bindir)
+	$(INSTALL) git-revert-script $(DESTDIR)$(bindir)/git-cherry-pick-script
 	$(MAKE) -C templates install
-
-install-tools:
 	$(MAKE) -C tools install
 
 install-doc: