diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-01-23 15:07:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-01-23 15:07:01 -0800 |
| commit | d8093fd6c192d900082eb8d78a385ca1e13effa8 (patch) | |
| tree | 4e938825ed59830afa28e6f2e5860718808f9397 /version.c | |
| parent | 7e3cb2e515ea2e2bc11d80bdb9a20f0daebc19a2 (diff) | |
| parent | 4771501c0a125dd3560391cbd716c63a281e8244 (diff) | |
| download | git-d8093fd6c192d900082eb8d78a385ca1e13effa8.tar.gz | |
Merge branch 'tc/meson-use-our-version-def-h'
The meson build procedure looked for the 'version-def.h' file in a
wrong directory, which has been corrected.
* tc/meson-use-our-version-def-h:
meson: ensure correct version-def.h is used
Diffstat (limited to 'version.c')
| -rw-r--r-- | version.c | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -1,8 +1,13 @@ #include "git-compat-util.h" #include "version.h" -#include "version-def.h" #include "strbuf.h" +#ifndef GIT_VERSION_H +# include "version-def.h" +#else +# include GIT_VERSION_H +#endif + const char git_version_string[] = GIT_VERSION; const char git_built_from_commit_string[] = GIT_BUILT_FROM_COMMIT; |