diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-05-19 17:23:07 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-19 17:23:07 -0700 |
| commit | 7c4f59d181d801c6da08aeca74e2ef78efe4cd2b (patch) | |
| tree | fbd86114f294d3335e0929472c3f1628ba4d0933 | |
| parent | 0081e36c9dc3c201e22f12ebebadfff88fa32b91 (diff) | |
| download | git-7c4f59d181d801c6da08aeca74e2ef78efe4cd2b.tar.gz git-7c4f59d181d801c6da08aeca74e2ef78efe4cd2b.tar.xz | |
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>
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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) |