[gobject-introspection] Substitute g-ir-scanner in Makefile, not in config



commit 1d1cc8c35364f9da12620c1925483b61dc688718
Author: Colin Walters <walters verbum org>
Date:   Mon Mar 16 15:36:21 2009 -0400

    Substitute g-ir-scanner in Makefile, not in configure.ac
    
    This avoids issues with unexpanded variables, i.e. ${exec_prefix}/libdir
---
 configure.ac      |    1 -
 tools/Makefile.am |    4 ++++
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index 8b57e17..5487e75 100644
--- 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
--- 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 = \



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]