1 files changed, 2 insertions, 2 deletions
diff --git a/GNUmakefile b/GNUmakefile
index 22f1e918..cd9e5a8f 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -69,7 +69,7 @@ $(builddir)/luarocks: src/bin/luarocks config.unix
        'package.loaded["luarocks.core.hardcoded"] = { '\
        "$$([ -n "$(FORCE_CONFIG)" ] && printf 'FORCE_CONFIG = true, ')"\
        'SYSCONFDIR = [[$(luarocksconfdir)]] }\n'\
-        'package.path=[[$(luadir)/?.lua;]] .. package.path\n'; \
+        'local list = package.searchers or package.loaders; table.insert(list, 1, function(name) if name:match("^luarocks%%.") then return loadfile([[$(luadir)/]] .. name:gsub([[%%.]], [[/]]) .. [[.lua]]) end end)\n'; \
        tail -n +2 src/bin/luarocks \
        )> "$@"
@@ -79,7 +79,7 @@ $(builddir)/luarocks-admin: src/bin/luarocks-admin config.unix
        'package.loaded["luarocks.core.hardcoded"] = { '\
        "$$([ -n "$(FORCE_CONFIG)" ] && printf 'FORCE_CONFIG = true, ')"\
        'SYSCONFDIR = [[$(luarocksconfdir)]] }\n'\
-        'package.path=[[$(luadir)/?.lua;]] .. package.path\n'; \
+        'local list = package.searchers or package.loaders; table.insert(list, 1, function(name) if name:match("^luarocks%%.") then return loadfile([[$(luadir)/]] .. name:gsub([[%%.]], [[/]]) .. [[.lua]]) end end)\n'; \
        tail -n +2 src/bin/luarocks-admin \
        )> "$@"

diff --git a/GNUmakefile b/GNUmakefile index 22f1e918..cd9e5a8f 100644 --- a/GNUmakefile +++ b/GNUmakefile
@@ -69,7 +69,7 @@ $(builddir)/luarocks: src/bin/luarocks config.unix
69	'package.loaded["luarocks.core.hardcoded"] = { '\	69	'package.loaded["luarocks.core.hardcoded"] = { '\
70	"$$([ -n "$(FORCE_CONFIG)" ] && printf 'FORCE_CONFIG = true, ')"\	70	"$$([ -n "$(FORCE_CONFIG)" ] && printf 'FORCE_CONFIG = true, ')"\
71	'SYSCONFDIR = [[$(luarocksconfdir)]] }\n'\	71	'SYSCONFDIR = [[$(luarocksconfdir)]] }\n'\
72	'package.path=[[$(luadir)/?.lua;]] .. package.path\n'; \	72	'local list = package.searchers or package.loaders; table.insert(list, 1, function(name) if name:match("^luarocks%%.") then return loadfile([[$(luadir)/]] .. name:gsub([[%%.]], [[/]]) .. [[.lua]]) end end)\n'; \
73	tail -n +2 src/bin/luarocks \	73	tail -n +2 src/bin/luarocks \
74	)> "$@"	74	)> "$@"
75		75
@@ -79,7 +79,7 @@ $(builddir)/luarocks-admin: src/bin/luarocks-admin config.unix
79	'package.loaded["luarocks.core.hardcoded"] = { '\	79	'package.loaded["luarocks.core.hardcoded"] = { '\
80	"$$([ -n "$(FORCE_CONFIG)" ] && printf 'FORCE_CONFIG = true, ')"\	80	"$$([ -n "$(FORCE_CONFIG)" ] && printf 'FORCE_CONFIG = true, ')"\
81	'SYSCONFDIR = [[$(luarocksconfdir)]] }\n'\	81	'SYSCONFDIR = [[$(luarocksconfdir)]] }\n'\
82	'package.path=[[$(luadir)/?.lua;]] .. package.path\n'; \	82	'local list = package.searchers or package.loaders; table.insert(list, 1, function(name) if name:match("^luarocks%%.") then return loadfile([[$(luadir)/]] .. name:gsub([[%%.]], [[/]]) .. [[.lua]]) end end)\n'; \
83	tail -n +2 src/bin/luarocks-admin \	83	tail -n +2 src/bin/luarocks-admin \
84	)> "$@"	84	)> "$@"
85		85