From 0fd29ff3ec13db4d12d9e52e467231fa90154c14 Mon Sep 17 00:00:00 2001
From: Francois Perrad <francois.perrad@gadz.org>
Date: Mon, 21 Sep 2009 10:25:32 +0200
Subject: [PATCH] add ../languages/lua/library/?.pbc as first path. This allows
 to :  - load languages/lua/library/uuid.pbc which loads library/uuid.pbc

---
 src/lib/luapackage.pir | 2 +-
 t/package.t            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lib/luapackage.pir b/src/lib/luapackage.pir
index f14ae3a..9f179ed 100644
--- a/src/lib/luapackage.pir
+++ b/src/lib/luapackage.pir
@@ -65,7 +65,7 @@ LIST
     _loaders[$P2] = loader_PBCroot
 
     setpath(_package, 'path', 'LUA_PATH', './?.lua')
-    setpath(_package, 'pbcpath', 'LUA_PBCPATH', 'library/?.pbc;./?.pbc;./?.pir')
+    setpath(_package, 'pbcpath', 'LUA_PBCPATH', '../languages/lua/library/?.pbc;library/?.pbc;./?.pbc;./?.pir')
 
     .local pmc _lua__REGISTRY
     _lua__REGISTRY = get_hll_global '_REGISTRY'
diff --git a/t/package.t b/t/package.t
index a6ef9a7..0d1b2a3 100644
--- a/t/package.t
+++ b/t/package.t
@@ -284,7 +284,7 @@ print(type(package.pbcpath))
 print(package.pbcpath)
 CODE
 string
-library/?.pbc;./?.pbc;./?.pir
+../languages/lua/library/?.pbc;library/?.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
-;library/?.pbc;./?.pbc;./?.pir;languages/lua/?.pbc
+;../languages/lua/library/?.pbc;library/?.pbc;./?.pbc;./?.pir;languages/lua/?.pbc
 OUTPUT
 
 delete $ENV{LUA_PBCPATH};