[seed] extensions: Fix substitution of paths into Seed.js



commit 53a1447c45949c8d9ab4a4e082499cf24bf9dafc
Author: Tim Horton <hortont424 gmail com>
Date:   Thu Dec 31 05:36:09 2009 -0500

    extensions: Fix substitution of paths into Seed.js
    
    This fixes the failure to find native modules when installing to unexpected
    prefixes.

 configure.ac           |    1 -
 extensions/Makefile.am |    3 +++
 extensions/Seed.js.in  |    4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index aaa3718..b184519 100644
--- a/configure.ac
+++ b/configure.ac
@@ -377,7 +377,6 @@ doc/mapping/mapping.html
 libseed/Makefile
 po/Makefile.in
 src/Makefile
-extensions/Seed.js
 extensions/Makefile
 tests/Makefile
 tests/javascript/Makefile
diff --git a/extensions/Makefile.am b/extensions/Makefile.am
index 64ae652..2ead093 100644
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@ -5,3 +5,6 @@ extension_DATA = Gio.js Seed.js Gtk.js GObject.js Clutter.js Gst.js
 
 repldir=$(datadir)/seed
 repl_DATA = repl.js
+
+Seed.js: Seed.js.in
+	$(AM_V_GEN) $(SED) -e "s|%pkglibdir%|$(pkglibdir)|" -e "s|%pkgdatadir%|$(pkgdatadir)|" $< > $@
\ No newline at end of file
diff --git a/extensions/Seed.js.in b/extensions/Seed.js.in
index 0740bd0..93671cb 100644
--- a/extensions/Seed.js.in
+++ b/extensions/Seed.js.in
@@ -174,8 +174,8 @@ Seed.printf = function () { print(Seed.sprintf.apply(this, arguments)) };
 if(!imports.searchPath || (imports.searchPath.length == 0))
 {
 	imports.searchPath = [ "@GNOME_JS_DIR@",
-	                       "@libdir@/seed",
-	                       "@prefix@/share/seed",
+	                       "%pkglibdir%",
+	                       "%pkgdatadir%",
 	                       "/usr/local/lib/seed",
 	                       "/usr/local/share/seed",
 	                       "/usr/lib/seed",



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