[PATCH] src/Makefile.am: Fix git-version.h for out of tree builds

Kristian Høgsberg hoegsberg at gmail.com
Mon Mar 18 18:09:31 PDT 2013


On Fri, Mar 01, 2013 at 03:38:23PM +0100, Andre Heider wrote:
> Use --git-dir instead of --work-tree, see
> http://marc.info/?l=git&m=120390208721287&w=2
> 
> Signed-off-by: Andre Heider <a.heider at gmail.com>

Yeah, that looks better, thanks.

Kristian

> ---
>  src/Makefile.am | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/Makefile.am b/src/Makefile.am
> index 2c93a7b..d56daa0 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -51,7 +51,7 @@ weston_SOURCES +=				\
>  endif
>  
>  git-version.h : .FORCE
> -	$(AM_V_GEN)(echo "#define BUILD_ID \"$(shell git --work-tree=$(top_srcdir) describe --always --dirty) $(shell git --work-tree=$(top_srcdir) log -1 --format='%s (%ci)')\"" > $@-new; \
> +	$(AM_V_GEN)(echo "#define BUILD_ID \"$(shell git --git-dir=$(top_srcdir)/.git describe --always --dirty) $(shell git --git-dir=$(top_srcdir)/.git log -1 --format='%s (%ci)')\"" > $@-new; \
>  	cmp -s $@ $@-new || cp $@-new $@; \
>  	rm $@-new)
>  
> -- 
> 1.8.1.2
> 
> _______________________________________________
> wayland-devel mailing list
> wayland-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/wayland-devel


More information about the wayland-devel mailing list