mod_adhoc: Add support for commands only executable by global administrators

[prosody.git] / Makefile

diff --git a/Makefile b/Makefile
index a25fe24b262c70194c06b5083138791eb79d9d87..51e376f04fe02c10a51b9d4b2bda8b6c0b0612f7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -21,16 +21,21 @@ install: prosody.install prosodyctl.install prosody.cfg.lua.install util/encodin
        install -m750 -d $(DATA)
        install -d $(MAN)/man1
        install -d $(CONFIG)/certs
-       install -d $(SOURCE)/core $(SOURCE)/net $(SOURCE)/util $(SOURCE)/fallbacks
+       install -d $(SOURCE)/core $(SOURCE)/net $(SOURCE)/util
        install -m755 ./prosody.install $(BIN)/prosody
        install -m755 ./prosodyctl.install $(BIN)/prosodyctl
        install -m644 core/* $(SOURCE)/core
        install -m644 net/* $(SOURCE)/net
-       install -m644 util/* $(SOURCE)/util
-       install -m644 fallbacks/* $(SOURCE)/fallbacks
-       install -m644 plugins/* $(MODULES)
+       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
        install -m644 certs/* $(CONFIG)/certs
-       install -m644 plugins/* $(MODULES)
+       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
@@ -71,7 +76,7 @@ prosody.cfg.lua.install:
        sed 's|certs/|$(INSTALLEDCONFIG)/certs/|' prosody.cfg.lua.dist > prosody.cfg.lua.install
 
 prosody.release:
-       test -e .hg/dirstate && hexdump -n6 -e'6/1 "%01x"' .hg/dirstate \
+       test -e .hg/dirstate && hexdump -n6 -e'6/1 "%02x"' .hg/dirstate \
            > prosody.version || true
 
 prosody.version: prosody.release