Re: [PATCH v2] meson: ensure correct version-def.h is used

From: Junio C Hamano <gitster@pobox.com>
Date: Jan 16, 2025, 15:57 UTC
Message-ID: <xmqqsepiu4yj.fsf@gitster.g>
In-Reply-To: <Z4jUsd77AFih24OW@pks.im>

Patrick Steinhardt <ps@pks.im> writes:

Show 21 quoted lines

>> diff --git a/version.c b/version.c
>> index 4d763ab48dd76c0445e5ea390ff4c1f35c1a4b12..4786c4e0a54093ca947da27f8b712bd1ea351203 100644
>> --- a/version.c
>> +++ b/version.c
>> @@ -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;
>
> Yup, this looks as expected. I'm fine with the solution (well,
> obviously, I proposed it), so this looks good to me.

Excellent.  Thanks, both of you.