diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-03-03 08:53:02 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-03-03 08:53:03 -0800 |
| commit | ca39da6997dbc4eb295219d7764fd68ecd80361e (patch) | |
| tree | 69733cd32637a21c8c0d485fdf7f8cda0d2222b6 /Makefile | |
| parent | 85e342adbdea3adbd70d607c0748c8a036d26c34 (diff) | |
| parent | 63a597dd94079887a1b5ad72f64a8b0ee822dc27 (diff) | |
Merge branch 'ps/meson-contrib-bits'
Update meson-based build procedure to cover contrib/ and other
places as well.
* ps/meson-contrib-bits:
ci: exercise credential helpers
ci: fix propagating UTF-8 test locale in musl-based Meson job
meson: wire up static analysis via Coccinelle
meson: wire up git-contacts(1)
meson: wire up credential helpers
contrib/credential: fix compilation of "osxkeychain" helper
contrib/credential: fix compiling "libsecret" helper
contrib/credential: fix compilation of wincred helper with MSVC
contrib/credential: fix "netrc" tests with out-of-tree builds
GIT-BUILD-OPTIONS: propagate project's source directory
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -3193,14 +3193,13 @@ GIT-BUILD-OPTIONS: FORCE -e "s|@GIT_PERF_MAKE_OPTS@|\'$(GIT_PERF_MAKE_OPTS)\'|" \ -e "s|@GIT_PERF_REPEAT_COUNT@|\'$(GIT_PERF_REPEAT_COUNT)\'|" \ -e "s|@GIT_PERF_REPO@|\'$(GIT_PERF_REPO)\'|" \ + -e "s|@GIT_SOURCE_DIR@|\'$(shell pwd)\'|" \ -e "s|@GIT_TEST_CMP@|\'$(GIT_TEST_CMP)\'|" \ -e "s|@GIT_TEST_CMP_USE_COPIED_CONTEXT@|\'$(GIT_TEST_CMP_USE_COPIED_CONTEXT)\'|" \ -e "s|@GIT_TEST_GITPERLLIB@|\'$(shell pwd)/perl/build/lib\'|" \ -e "s|@GIT_TEST_INDEX_VERSION@|\'$(GIT_TEST_INDEX_VERSION)\'|" \ - -e "s|@GIT_TEST_MERGE_TOOLS_DIR@|\'$(shell pwd)/mergetools\'|" \ -e "s|@GIT_TEST_OPTS@|\'$(GIT_TEST_OPTS)\'|" \ -e "s|@GIT_TEST_PERL_FATAL_WARNINGS@|\'$(GIT_TEST_PERL_FATAL_WARNINGS)\'|" \ - -e "s|@GIT_TEST_POPATH@|\'$(shell pwd)/po\'|" \ -e "s|@GIT_TEST_TEMPLATE_DIR@|\'$(shell pwd)/templates/blt\'|" \ -e "s|@GIT_TEST_TEXTDOMAINDIR@|\'$(shell pwd)/po/build/locale\'|" \ -e "s|@GIT_TEST_UTF8_LOCALE@|\'$(GIT_TEST_UTF8_LOCALE)\'|" \ |