From: Junio C Hamano <junkio@cox.net>
Date: Sat, 20 May 2006 00:23:07 +0000 (-0700)
Subject: Fix build procedure for builtin-init-db
X-Git-Tag: v1.4.0-rc1~113
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;ds=sidebyside;h=7c4f59d181d801c6da08aeca74e2ef78efe4cd2b;p=git.git

Fix build procedure for builtin-init-db

c3c8835fbb182d971d71939b9a3ec7c8b86d6caf broke the default template
location which is in builtin-init-db.o, by not supplying the
compilation-time constant to the right build commands.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/Makefile b/Makefile
index 3a31ce01..4fd6520b 100644
--- a/Makefile
+++ b/Makefile
@@ -461,6 +461,7 @@ PYTHON_PATH_SQ = $(subst ','\'',$(PYTHON_PATH))
 GIT_PYTHON_DIR_SQ = $(subst ','\'',$(GIT_PYTHON_DIR))
 
 ALL_CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER_SQ)' $(COMPAT_CFLAGS)
+ALL_CFLAGS += -DDEFAULT_GIT_TEMPLATE_DIR='"$(template_dir_SQ)"'
 LIB_OBJS += $(COMPAT_OBJS)
 export prefix TAR INSTALL DESTDIR SHELL_PATH template_dir
 ### Build rules
@@ -475,7 +476,6 @@ strip: $(PROGRAMS) git$X
 
 git$X: git.c common-cmds.h $(BUILTIN_OBJS) $(GITLIBS)
 	$(CC) -DGIT_VERSION='"$(GIT_VERSION)"' \
-		-DDEFAULT_GIT_TEMPLATE_DIR='"$(template_dir_SQ)"' \
 		$(ALL_CFLAGS) -o $@ $(filter %.c,$^) \
 		$(BUILTIN_OBJS) $(ALL_LDFLAGS) $(LIBS)