init: use the correct path of the templates directory again
In df93e407f06 (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 <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
May 20, 2024 at 20:22 UTC
197a772c48652d94ddb340fc6bcd8ed4440ff233
1 file changed
+1
-1
Makefile
+1
-1
@@ -2751,7 +2751,7 @@ exec-cmd.sp exec-cmd.s exec-cmd.o: EXTRA_CPPFLAGS = \
2751
'-DFALLBACK_RUNTIME_PREFIX="$(prefix_SQ)"'
2752
2753
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 = \
2755
-DDEFAULT_GIT_TEMPLATE_DIR='"$(template_dir_SQ)"'
2756
2757
config.sp config.s config.o: GIT-PREFIX