[PATCH v2 2/2] Makefile: get the git version from the submodule

[Lars Hjemli]

On Mon, Mar 4, 2013 at 2:49 PM, Ferry Huberts <mailings at hupie.com> wrote:
>
> On 04/03/13 14:38, Lars Hjemli wrote:
>>
>> On Mon, Mar 4, 2013 at 2:26 PM, Ferry Huberts <mailings at hupie.com> wrote:
>>>
>>> diff --git a/Makefile b/Makefile
>>> index 118a2c9..6d834ed 100644
>>> --- a/Makefile
>>> +++ b/Makefile
>>> @@ -14,8 +14,8 @@ htmldir = $(docdir)
>>>   pdfdir = $(docdir)
>>>   mandir = $(prefix)/share/man
>>>   SHA1_HEADER = <openssl/sha.h>
>>> -GIT_VER = 1.7.12.4
>>> -GIT_URL = https://github.com/git/git/archive/v$(GIT_VER).tar.gz
>>> +GIT_VER = $(shell git submodule status git | sed -r
>>> 's/^[^0-9a-fA-F]*([0-9a-fA-F]*).*/\1/')
>>> +GIT_URL = https://github.com/git/git/archive/$(GIT_VER).tar.gz
>>
>>
>> Please don't do this - the GIT_URL is used when building from a cgit
>> tarball, in which case `git submodule` wlll fail...
>>
>
> no problem, now we just need a reminder somewhere that the makefile also has
> to be updated ;-)

Yeah, a patch for 'make test' to catch this would be nice.

--
larsh