From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> We use IGT_DATADIR to refer to $pkgdatadir elsewhere, so let's have intel_reg follow suit. Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> --- tools/Makefile.am | 2 +- tools/intel_reg.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index 2c7b57997447..35732c178fd1 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -17,7 +17,7 @@ SUBDIRS = null_state_gen registers AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/lib AM_CFLAGS = $(DEBUG_CFLAGS) $(DRM_CFLAGS) $(PCIACCESS_CFLAGS) $(CWARNFLAGS) \ - $(CAIRO_CFLAGS) $(LIBUNWIND_CFLAGS) -DPKGDATADIR=\"$(pkgdatadir)\" \ + $(CAIRO_CFLAGS) $(LIBUNWIND_CFLAGS) -DIGT_DATADIR=\"$(pkgdatadir)\" \ $(WERROR_CFLAGS) -D_GNU_SOURCE LDADD = $(top_builddir)/lib/libintel_tools.la AM_LDFLAGS = -Wl,--as-needed diff --git a/tools/intel_reg.c b/tools/intel_reg.c index b3823fd82dd3..d6f8184027a6 100644 --- a/tools/intel_reg.c +++ b/tools/intel_reg.c @@ -713,7 +713,7 @@ static int read_reg_spec(struct config *config) path = getenv("INTEL_REG_SPEC"); if (!path) - path = PKGDATADIR"/registers"; + path = IGT_DATADIR"/registers"; r = stat(path, &st); if (r) { -- 2.13.5 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx