mod_admin_telnet: Prep jids for user:create() etc.

[prosody.git] / Makefile

diff --git a/Makefile b/Makefile
index 9d0c3d235378ac59aa378981e1d6c8a304d3ad36..c5390599064405960c303b55f095f2c51fa02b41 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,6 +17,9 @@ INSTALLEDDATA = $(DATADIR)
 
 all: prosody.install prosodyctl.install prosody.cfg.lua.install prosody.version
        $(MAKE) -C util-src install
+ifeq ($(EXCERTS),yes)
+       $(MAKE) -C certs localhost.crt example.com.crt || true
+endif
 
 install: prosody.install prosodyctl.install prosody.cfg.lua.install util/encodings.so util/encodings.so util/pposix.so util/signal.so
        install -d $(BIN) $(CONFIG) $(MODULES) $(SOURCE)
@@ -27,20 +30,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 +55,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)/';|;" < $^ > $@
@@ -63,6 +65,7 @@ prosody.cfg.lua.install: prosody.cfg.lua.dist
        sed 's|certs/|$(INSTALLEDCONFIG)/certs/|' $^ > $@
 
 prosody.version: $(wildcard prosody.release .hg/dirstate)
-       test -e .hg/dirstate && hexdump -n6 -e'6/1 "%02x"' .hg/dirstate \
-               > $@
-       test -f prosody.release && cp prosody.release $@ || true
+       test -e .hg/dirstate && \
+               hexdump -n6 -e'6/1 "%02x"' .hg/dirstate > $@ || true
+       test -f prosody.release && \
+               cp prosody.release $@ || true