Skip to content

Commit 197a772

Browse files
dschogitster
authored andcommitted
init: use the correct path of the templates directory again
In df93e40 (init: refactor the template directory discovery into its own function, 2024-03-29), I refactored the way the templates directory is discovered. The refactoring was faithful, but missed a reference in the `Makefile` where the `DEFAULT_GIT_TEMPLATE_DIR` constant is defined. As a consequence, Git v2.45.1 and friends will always use the hard-coded path `/usr/share/git-core/templates`. Let's fix that by defining the `DEFAULT_GIT_TEMPLATE_DIR` when building `setup.o`, where that constant is actually used. Signed-off-by: Johannes Schindelin <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent ee05253 commit 197a772

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2751,7 +2751,7 @@ exec-cmd.sp exec-cmd.s exec-cmd.o: EXTRA_CPPFLAGS = \
27512751
'-DFALLBACK_RUNTIME_PREFIX="$(prefix_SQ)"'
27522752

27532753
builtin/init-db.sp builtin/init-db.s builtin/init-db.o: GIT-PREFIX
2754-
builtin/init-db.sp builtin/init-db.s builtin/init-db.o: EXTRA_CPPFLAGS = \
2754+
setup.sp setup.s setup.o: EXTRA_CPPFLAGS = \
27552755
-DDEFAULT_GIT_TEMPLATE_DIR='"$(template_dir_SQ)"'
27562756

27572757
config.sp config.s config.o: GIT-PREFIX

0 commit comments

Comments
 (0)