aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--GNUmakefile6
-rw-r--r--loader.lua9
-rw-r--r--makefile6
3 files changed, 19 insertions, 2 deletions
diff --git a/GNUmakefile b/GNUmakefile
index c8d2d3dd..732ae645 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -42,6 +42,10 @@ install-bin: prosody.install prosodyctl.install
$(INSTALL_EXEC) ./prosody.install $(BIN)/prosody
$(INSTALL_EXEC) ./prosodyctl.install $(BIN)/prosodyctl
+install-loader:
+ $(MKDIR) $(SOURCE)
+ $(INSTALL_DATA) loader.lua $(SOURCE)
+
install-core:
$(MKDIR) $(SOURCE)
$(MKDIR) $(SOURCE)/core
@@ -89,7 +93,7 @@ install-meta:
install-data:
$(MKDIR_PRIVATE) $(DATA)
-install: install-util install-net install-core install-plugins install-bin install-etc install-man install-meta install-data
+install: install-util install-net install-core install-plugins install-bin install-etc install-man install-meta install-data install-loader
clean:
rm -f prosody.install
diff --git a/loader.lua b/loader.lua
new file mode 100644
index 00000000..e6931cce
--- /dev/null
+++ b/loader.lua
@@ -0,0 +1,9 @@
+for i = #package.searchers, 1, -1 do
+ local search = package.searchers[i];
+ table.insert(package.searchers, i, function(module_name)
+ local lib = module_name:match("^prosody%.(.*)$");
+ if lib then
+ return search(lib);
+ end
+ end)
+end
diff --git a/makefile b/makefile
index 7f17de03..90e5506d 100644
--- a/makefile
+++ b/makefile
@@ -44,6 +44,10 @@ install-bin: prosody.install prosodyctl.install
$(INSTALL_EXEC) ./prosody.install $(BIN)/prosody
$(INSTALL_EXEC) ./prosodyctl.install $(BIN)/prosodyctl
+install-loader:
+ $(MKDIR) $(SOURCE)
+ $(INSTALL_DATA) loader.lua $(SOURCE)
+
install-core:
$(MKDIR) $(SOURCE)
$(MKDIR) $(SOURCE)/core
@@ -91,7 +95,7 @@ install-meta:
install-data:
$(MKDIR_PRIVATE) $(DATA)
-install: install-util install-net install-core install-plugins install-bin install-etc install-man install-meta install-data
+install: install-util install-net install-core install-plugins install-bin install-etc install-man install-meta install-data install-loader
clean:
rm -f prosody.install