Substitute g-ir-scanner in Makefile, not in configure.ac

This avoids issues with unexpanded variables, i.e. ${exec_prefix}/libdir

diff --git a/configure.ac b/configure.ac
index 8b57e17..5487e75 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -212,5 +212,4 @@ examples/Makefile
 docs/Makefile
 docs/reference/Makefile
 gobject-introspection-1.0.pc])
-AC_CONFIG_FILES([tools/g-ir-scanner], [chmod a+x tools/g-ir-scanner])
 AC_OUTPUT

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 706b5e3..4aefb0a 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -8,6 +8,10 @@ bin_PROGRAMS = g-ir-compiler g-ir-generate
 bin_SCRIPTS = g-ir-scanner
 EXTRA_DIST = g-ir-scanner
 
+g-ir-scanner: g-ir-scanner.in Makefile
+       sed -e s,@libdir\@,$(libdir), $< > $@.tmp && mv $@.tmp $@
+       chmod a+x $@
+
 g_ir_compiler_SOURCES = compiler.c     
 g_ir_compiler_CFLAGS = $(GIREPO_CFLAGS)
 g_ir_compiler_LDADD = \