[5/6] meson: Process intel_aubdump.in into intel_aubdump
diff mbox

Message ID 20170914011100.7743-5-jordan.l.justen@intel.com
State New
Headers show

Commit Message

Jordan Justen Sept. 14, 2017, 1:10 a.m. UTC
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
---
 tools/meson.build | 7 +++++++
 1 file changed, 7 insertions(+)

Comments

Ville Syrjälä Sept. 14, 2017, 7:10 p.m. UTC | #1
On Wed, Sep 13, 2017 at 06:10:59PM -0700, Jordan Justen wrote:
> Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
> ---
>  tools/meson.build | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/tools/meson.build b/tools/meson.build
> index 91c58760..20b63cce 100644
> --- a/tools/meson.build
> +++ b/tools/meson.build
> @@ -57,4 +57,11 @@ endforeach
>  shared_library('intel_aubdump', 'aubdump.c',
>                 dependencies : [ igt_deps, dlsym ], install : true)
>  
> +conf_data = configuration_data()
> +conf_data.set('prefix', get_option('prefix'))
> +conf_data.set('exec_prefix', '${prefix}')
> +conf_data.set('libdir', join_paths('${prefix}', get_option('libdir')))
> +configure_file(input : 'intel_aubdump.in', output : 'intel_aubdump',
> +               configuration : conf_data, install_dir : get_option('bindir'))

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

I haven't yet figured out why meson installs something without
explicit guidance, and other things it leaves behind until you tell it
otherwise. This one didn't seem to need the manual prodding. Someone
care to clue me in on the rules?

> +
>  subdir('null_state_gen')
> -- 
> 2.14.1
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Patch
diff mbox

diff --git a/tools/meson.build b/tools/meson.build
index 91c58760..20b63cce 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -57,4 +57,11 @@  endforeach
 shared_library('intel_aubdump', 'aubdump.c',
                dependencies : [ igt_deps, dlsym ], install : true)
 
+conf_data = configuration_data()
+conf_data.set('prefix', get_option('prefix'))
+conf_data.set('exec_prefix', '${prefix}')
+conf_data.set('libdir', join_paths('${prefix}', get_option('libdir')))
+configure_file(input : 'intel_aubdump.in', output : 'intel_aubdump',
+               configuration : conf_data, install_dir : get_option('bindir'))
+
 subdir('null_state_gen')