fix LUA_PBCPATH for build tree

fperrad · Sep 7, 2009 · 718c326 · 718c326
1 parent e0dd9cd
commit 718c326
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/lib/luapackage.pir b/src/lib/luapackage.pir
@@ -65,8 +65,8 @@ LIST
     _loaders[$P2] = loader_PBCroot
 
     setpath(_package, 'path', 'LUA_PATH', './?.lua;src/lib/?.lua')
-#    setpath(_package, 'pbcpath', 'LUA_PBCPATH', './?.pbc;./?.pir')
-    setpath(_package, 'pbcpath', 'LUA_PBCPATH', 'lua/?.pbc;./?.pbc;./?.pir')
+#    setpath(_package, 'pbcpath', 'LUA_PBCPATH', 'library/?.pbc;./?.pbc;./?.pir')
+    setpath(_package, 'pbcpath', 'LUA_PBCPATH', 'library/?.pbc;lua/?.pbc;./?.pbc;./?.pir')
 
     .local pmc _lua__REGISTRY
     _lua__REGISTRY = get_hll_global '_REGISTRY'

diff --git a/t/package.t b/t/package.t
@@ -284,7 +284,7 @@ print(type(package.pbcpath))
 print(package.pbcpath)
 CODE
 string
-lua/?.pbc;./?.pbc;./?.pir
+library/?.pbc;lua/?.pbc;./?.pbc;./?.pir
 OUTPUT
 
 $ENV{LUA_PBCPATH} = "?.pbc";
@@ -298,7 +298,7 @@ $ENV{LUA_PBCPATH} = ";;languages/lua/?.pbc";
 language_output_is( 'lua', << 'CODE', << 'OUTPUT', 'table package.pbcpath' );
 print(package.pbcpath)
 CODE
-;lua/?.pbc;./?.pbc;./?.pir;languages/lua/?.pbc
+;library/?.pbc;lua/?.pbc;./?.pbc;./?.pir;languages/lua/?.pbc
 OUTPUT
 
 delete $ENV{LUA_PBCPATH};