[Intel-gfx] lib: Fix out of tree build of version.h

[Thomas Wood]

On 11 December 2014 at 13:11, Joonas Lahtinen
<joonas.lahtinen at linux.intel.com> wrote:
> Currently out of tree build fails because the version.h.tmp is generated
> into the source directory instead of the build directory where it is
> later looked for. This commit fixes it.
>
> From 2c0617e21101d69e7219c6660936c0015f93f8ee Mon Sep 17 00:00:00 2001
> From: Joonas Lahtinen <joonas.lahtinen at linux.intel.com>
> Date: Thu, 11 Dec 2014 15:05:11 +0200
> Subject: [PATCH] lib: Fix out of tree build of version.h
>
> Write the version.h.tmp file into the build directory instead of source
> directory. This allows out of tree building when those two are not the
> same.
>
> Signed-off-by: Joonas Lahtinen <joonas.lahtinen at linux.intel.com>

Patch merged, thanks.


> ---
>  lib/Makefile.sources |   12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/lib/Makefile.sources b/lib/Makefile.sources
> index 819b21a..34a3d31 100644
> --- a/lib/Makefile.sources
> +++ b/lib/Makefile.sources
> @@ -55,16 +55,16 @@ libintel_tools_la_SOURCES =         \
>  $(IGT_LIB_PATH)/version.h.tmp:
>         @touch $@
>         @if test -d $(GPU_TOOLS_PATH)/.git; then \
> -               if which git > /dev/null 2>&1; then cd $(@D); \
> +               if which git > /dev/null 2>&1; then \
> +                       cd $(GPU_TOOLS_PATH); \
>                         git log -n 1 --oneline | \
> -                       sed 's/^\([^ ]*\) .*/#define IGT_GIT_SHA1 "g\1"/' \
> -                       >> $(@F) ; \
> +                       sed 's/^\([^ ]*\) .*/#define IGT_GIT_SHA1 "g\1"/' ; \
>                 else \
> -                       echo '#define IGT_GIT_SHA1 "NO-GIT"' >> $@ ; \
> +                       echo '#define IGT_GIT_SHA1 "NO-GIT"' ; \
>                 fi \
>         else \
> -               echo '#define IGT_GIT_SHA1 "NOT-GIT"' >> $@ ; \
> -       fi
> +               echo '#define IGT_GIT_SHA1 "NOT-GIT"' ; \
> +       fi >> $@
>
>
>  $(IGT_LIB_PATH)/version.h: $(IGT_LIB_PATH)/version.h.tmp
> --
> 1.7.9.5