moduleapi: in module:provides(), add the name of the module in item._provided_by

[prosody.git] / Makefile

diff --git a/Makefile b/Makefile
index 0fa8b28eeb4ead9465017b46f32327e5d9fa6919..b96b6732cda003320a38162cbf164ed5b3f8ee28 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -27,20 +27,18 @@ install: prosody.install prosodyctl.install prosody.cfg.lua.install util/encodin
        install -m755 ./prosody.install $(BIN)/prosody
        install -m755 ./prosodyctl.install $(BIN)/prosodyctl
        install -m644 core/* $(SOURCE)/core
-       install -m644 net/* $(SOURCE)/net
+       install -m644 net/*.lua $(SOURCE)/net
+       install -d $(SOURCE)/net/http
+       install -m644 net/http/*.lua $(SOURCE)/net/http
        install -m644 util/*.lua $(SOURCE)/util
        install -m644 util/*.so $(SOURCE)/util
        install -d $(SOURCE)/util/sasl
        install -m644 util/sasl/* $(SOURCE)/util/sasl
-       install -m644 plugins/*.lua $(MODULES)
-       install -d $(MODULES)/muc
-       install -m644 plugins/muc/* $(MODULES)/muc
+       umask 0022 && cp -r plugins/* $(MODULES)
        install -m644 certs/* $(CONFIG)/certs
-       install -d $(MODULES)/adhoc
-       install -m644 plugins/adhoc/*.lua $(MODULES)/adhoc
        install -m644 man/prosodyctl.man $(MAN)/man1/prosodyctl.1
        test -e $(CONFIG)/prosody.cfg.lua || install -m644 prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua
-       test -e prosody.version && install prosody.version $(SOURCE)/prosody.version || true
+       test -e prosody.version && install -m644 prosody.version $(SOURCE)/prosody.version || true
        $(MAKE) install -C util-src
 
 clean:
@@ -54,7 +52,8 @@ util/%.so:
        $(MAKE) install -C util-src
 
 %.install: %
-       sed "s|^CFG_SOURCEDIR=.*;$$|CFG_SOURCEDIR='$(INSTALLEDSOURCE)';|; \
+       sed "1s/\blua\b/$(RUNWITH)/; \
+               s|^CFG_SOURCEDIR=.*;$$|CFG_SOURCEDIR='$(INSTALLEDSOURCE)';|; \
                s|^CFG_CONFIGDIR=.*;$$|CFG_CONFIGDIR='$(INSTALLEDCONFIG)';|; \
                s|^CFG_DATADIR=.*;$$|CFG_DATADIR='$(INSTALLEDDATA)';|; \
                s|^CFG_PLUGINDIR=.*;$$|CFG_PLUGINDIR='$(INSTALLEDMODULES)/';|;" < $^ > $@