patchTo make GIT-VERSION-FILE, search for git more widely

> Problem: when git is installed into /usr/local/bin, running 'sudo make
> install' won't find git in $PATH (because sudo strips PATH, for instance
> on openSUSE 11.1, and doesn't include /usr/local/whatever).
> 
> This causes GIT-VERSION-FILE to not find git for git describe, and fall
> back to DEF_VER.
> 
> This in turn causes rebuilds of major parts of the system.
> 
> This patch passes GIT through to the shell script, and additionally
> looks for the current version and in ${prefix}/bin.
> 
> Signed-off-by: Matthias Andree <matthias.andree@gmx.de>
> ---
>  GIT-VERSION-GEN |    7 ++++---
>  Makefile        |    6 +++++-
>  2 files changed, 9 insertions(+), 4 deletions(-)
> 
> diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
> index 39cde78..66c171e 100755
> --- a/GIT-VERSION-GEN
> +++ b/GIT-VERSION-GEN
> @@ -2,6 +2,7 @@
>  
>  GVF=GIT-VERSION-FILE
>  DEF_VER=v1.6.3.GIT
> +test -x "$GIT" || GIT=git
>  
>  LF='
>  '
> @@ -12,12 +13,12 @@ if test -f version
>  then
>  	VN=$(cat version) || VN="$DEF_VER"
>  elif test -d .git -o -f .git &&
> -	VN=$(git describe --abbrev=4 HEAD 2>/dev/null) &&
> +	VN=$(${GIT} describe --abbrev=4 HEAD 2>/dev/null) &&

>  	case "$VN" in
>  	*$LF*) (exit 1) ;;
>  	v[0-9]*)
> -		git update-index -q --refresh
> -		test -z "$(git diff-index --name-only HEAD --)" ||
> +		${GIT} update-index -q --refresh
> +		test -z "$(${GIT} diff-index --name-only HEAD --)" ||
>  		VN="$VN-dirty" ;;
>  	esac
>  then
> diff --git a/Makefile b/Makefile
> index 6e21643..8e34877 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -177,7 +177,11 @@ all::
>  # away (some NTFS drivers seem to zero the contents in that scenario).
>  
>  GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
> -	@$(SHELL_PATH) ./GIT-VERSION-GEN
> +	@{ GIT=./git$X ; type $$GIT >/dev/null 2>&1 ; } \
> +	    || { GIT=$(prefix)/bin/git$X ; type $$GIT >/dev/null 2>&1 ; }\
> +	    || GIT=git ; \
> +	    export GIT ; \
> +	    $(SHELL_PATH) ./GIT-VERSION-GEN
>  -include GIT-VERSION-FILE
>  
>  uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')

> Matthias Andree <matthias.andree@gmx.de> writes:
>
>> Problem: when git is installed into /usr/local/bin, running 'sudo make
>> install' won't find git in $PATH (because sudo strips PATH, for instance
>> on openSUSE 11.1, and doesn't include /usr/local/whatever).
>
> That sounds like a bug/misfeature in sudo (which I do not use) to me.

> Some points:
>
> 1. sudo is the default sysadmin setup on Ubuntu (more so than on openSUSE)
>
> 2. sudo strips the environment by default for security reasons

> Am 07.05.2009, 10:54 Uhr, schrieb Nicolas Sebrecht <nicolas.s.dev@gmx.fr>:
>
> > This is a configuration option that the sysadmin has to set (see
> > env_keep in man sudoers (5) or http://linux.die.net/man/5/sudoers).
>
> Salut Nicolas,
>
> I'm aware of that.
>
> > I don't see any good reason to bypass this behaviour since it is what
> > sysadmins expect.
>
> Are you agreeing or objecting?

> Matthias Andree <matthias.andree@gmx.de> writes:
> 
>> Problem: when git is installed into /usr/local/bin, running 'sudo make
>> install' won't find git in $PATH (because sudo strips PATH, for instance
>> on openSUSE 11.1, and doesn't include /usr/local/whatever).
> 
> That sounds like a bug/misfeature in sudo (which I do not use) to me.

> Junio C Hamano schrieb:
>> Matthias Andree <matthias.andree@gmx.de> writes:
>>
>>> Problem: when git is installed into /usr/local/bin, running 'sudo make
>>> install' won't find git in $PATH (because sudo strips PATH, for instance
>>> on openSUSE 11.1, and doesn't include /usr/local/whatever).
>>
>> That sounds like a bug/misfeature in sudo (which I do not use) to me.
> 
> sudo resets the environment, in particular also PATH. Why would this be a bug?
> 
> Current distros set env_reset in /etc/soduers for a reason. Not that I
> know the reason in detail, but I won't claim that I'm more clever with
> regards to security issues than distro packagers; so I trust that if they
> do it, then it makes sense.
> 
> -- Hannes

> Johannes Sixt venit, vidit, dixit 07.05.2009 10:47:
>> Junio C Hamano schrieb:
>>> Matthias Andree <matthias.andree@gmx.de> writes:
>>>
>>>> Problem: when git is installed into /usr/local/bin, running 'sudo make
>>>> install' won't find git in $PATH (because sudo strips PATH, for  
>>>> instance
>>>> on openSUSE 11.1, and doesn't include /usr/local/whatever).
>>>
>>> That sounds like a bug/misfeature in sudo (which I do not use) to me.
>>
>> sudo resets the environment, in particular also PATH. Why would this be  
>> a bug?
>>
>> Current distros set env_reset in /etc/soduers for a reason. Not that I
>> know the reason in detail, but I won't claim that I'm more clever with
>> regards to security issues than distro packagers; so I trust that if  
>> they
>> do it, then it makes sense.
>>
>> -- Hannes
>
> sudo's behaviour is fine, but the OP's is not: doing "sudo make install"
> amounts to building git as root, unless you have done a make as non-root
> before. If you have done that make then GIT-VERSION-FILE will be
> up-to-date, and GIT-VERSION-GEN will not even be called by "make  
> install".

> Junio C Hamano schrieb:
>> Matthias Andree <matthias.andree@gmx.de> writes:
>>
>>> Problem: when git is installed into /usr/local/bin, running 'sudo make
>>> install' won't find git in $PATH (because sudo strips PATH, for  
>>> instance
>>> on openSUSE 11.1, and doesn't include /usr/local/whatever).
>>
>> That sounds like a bug/misfeature in sudo (which I do not use) to me.
>
> sudo resets the environment, in particular also PATH. Why would this be  
> a bug?
>
> Current distros set env_reset in /etc/soduers for a reason. Not that I
> know the reason in detail, but I won't claim that I'm more clever with
> regards to security issues than distro packagers; so I trust that if they
> do it, then it makes sense.