From 2dada482c14142fd3697f2e0eeb0b4102cdbb4bc Mon Sep 17 00:00:00 2001
From: mcuelenaere <mcuelenaere@a1c6a512-1295-4272-9138-f99709370657>
Date: Fri, 10 Jul 2009 11:30:26 +0000
Subject: [PATCH] Lua:  * add ./?/init.lua to the search path for require  *
 put Lua libs in /.rockbox/rocks/viewers/lua/

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21739 a1c6a512-1295-4272-9138-f99709370657
---
 apps/plugins/lua/rockconf.h | 2 +-
 tools/buildzip.pl           | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/plugins/lua/rockconf.h b/apps/plugins/lua/rockconf.h
index 67994bb3c..639f336b5 100644
--- a/apps/plugins/lua/rockconf.h
+++ b/apps/plugins/lua/rockconf.h
@@ -29,7 +29,7 @@
 #undef luai_jmpbuf
 
 #undef LUA_PATH_DEFAULT
-#define LUA_PATH_DEFAULT  "$/?.lua;" VIEWERS_DIR"/?.lua;"
+#define LUA_PATH_DEFAULT  "$/?.lua;" "$/?/init.lua;" VIEWERS_DIR"/lua/?.lua;" VIEWERS_DIR"/lua/?/init.lua;"
 
 #ifndef SIMULATOR
 #include "../../codecs/lib/setjmp.h"
diff --git a/tools/buildzip.pl b/tools/buildzip.pl
index d21fd8e55..a3ac75fa3 100755
--- a/tools/buildzip.pl
+++ b/tools/buildzip.pl
@@ -429,7 +429,8 @@ STOP
     glob_copy('apps/lang/*lng', "$rbdir/langs/");
 
     # copy the .lua files
-    glob_copy('apps/plugins/lua/*.lua', "$rbdir/rocks/viewers/");
+    mkdir "$rbdir/rocks/viewers/lua/", 0777;
+    glob_copy('apps/plugins/lua/*.lua', "$rbdir/rocks/viewers/lua/");
 }
 
 my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) =
-- 
2.11.4.GIT