@matheusbsbs / matheus-bagliano / commits / 7c4f59d181
Fork 0

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>

Junio C Hamano committed May 19, 2006 at 17:23 UTC 7c4f59d181d801c6da08aeca74e2ef78efe4cd2b
1 file changed +1 -1
Makefile
+1 -1
@@ -461,6 +461,7 @@ PYTHON_PATH_SQ = $(subst ','\'',$(PYTHON_PATH))
461 GIT_PYTHON_DIR_SQ = $(subst ','\'',$(GIT_PYTHON_DIR))
462
463 ALL_CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER_SQ)' $(COMPAT_CFLAGS)
464 +ALL_CFLAGS += -DDEFAULT_GIT_TEMPLATE_DIR='"$(template_dir_SQ)"'
465 LIB_OBJS += $(COMPAT_OBJS)
466 export prefix TAR INSTALL DESTDIR SHELL_PATH template_dir
467 ### Build rules
@@ -475,7 +476,6 @@ strip: $(PROGRAMS) git$X
476
477 git$X: git.c common-cmds.h $(BUILTIN_OBJS) $(GITLIBS)
478 $(CC) -DGIT_VERSION='"$(GIT_VERSION)"' \
478 - -DDEFAULT_GIT_TEMPLATE_DIR='"$(template_dir_SQ)"' \
479 $(ALL_CFLAGS) -o $@ $(filter %.c,$^) \
480 $(BUILTIN_OBJS) $(ALL_LDFLAGS) $(LIBS)
481