[PATCH] Fix git-merge-cache -q

[git.git] / Makefile

diff --git a/Makefile b/Makefile
index 4622e03..425e9a4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -39,6 +39,8 @@ CFLAGS+=$(COPTS) -Wall $(DEFINES)
 
 prefix=$(HOME)
 bindir=$(prefix)/bin
+etcdir=$(prefix)/etc
+etcgitdir=$(etcdir)/git-core
 # dest=
 
 CC?=gcc
@@ -73,7 +75,7 @@ SCRIPTS += git-send-email-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 \
        git-checkout-cache git-diff-tree git-rev-tree git-ls-files \
-       git-check-files git-ls-tree git-merge-base git-merge-cache \
+       git-ls-tree git-merge-base git-merge-cache \
        git-unpack-file git-export git-diff-cache git-convert-cache \
        git-ssh-push git-ssh-pull git-rev-list git-mktag \
        git-diff-helper git-tar-tree git-local-pull git-hash-object \
@@ -93,7 +95,8 @@ LIB_H=cache.h object.h blob.h tree.h commit.h tag.h delta.h epoch.h csum-file.h
        pack.h pkt-line.h refs.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
+        refs.o csum-file.o pack-check.o pkt-line.o connect.o ident.o \
+        sha1_name.o
 
 LIB_H += rev-cache.h
 LIB_OBJS += rev-cache.o
@@ -144,6 +147,7 @@ endif
 endif
 
 CFLAGS += '-DSHA1_HEADER=$(SHA1_HEADER)'
+CFLAGS += '-DDEFAULT_GIT_TEMPLATE_ENVIRONMENT="$(etcgitdir)/templates"'
 
 
 
@@ -196,6 +200,7 @@ check:
 install: $(PROG) $(SCRIPTS)
        $(INSTALL) -m755 -d $(dest)$(bindir)
        $(INSTALL) $(PROG) $(SCRIPTS) $(dest)$(bindir)
+       $(MAKE) -C templates install
 
 install-tools:
        $(MAKE) -C tools install
@@ -236,4 +241,5 @@ clean:
        rm -f git-core-*.tar.gz git-core.spec
        $(MAKE) -C tools/ clean
        $(MAKE) -C Documentation/ clean
+       $(MAKE) -C templates/ clean
        $(MAKE) -C t/ clean