mod_tls: Only advertise TLS if the server told us which host they are connecting to

[prosody.git] / Makefile

diff --git a/Makefile b/Makefile
index df9f4aeee289a5b3350080967b770e7bf9115a00..93ca8c9be7eb4c089f6c6c12f1cfa216e6b044a0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,7 @@ CONFIG = $(DESTDIR)$(SYSCONFDIR)
 MODULES = $(DESTDIR)$(PREFIX)/lib/prosody/modules
 SOURCE = $(DESTDIR)$(PREFIX)/lib/prosody
 DATA = $(DESTDIR)$(DATADIR)
+MAN = $(DESTDIR)$(PREFIX)/share/man
 
 INSTALLEDSOURCE = $(PREFIX)/lib/prosody
 INSTALLEDCONFIG = $(SYSCONFDIR)
@@ -18,6 +19,7 @@ all: prosody.install prosodyctl.install prosody.cfg.lua.install prosody.version
 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)
        install -m750 -d $(DATA)
+       install -d $(MAN)/man1
        install -d $(CONFIG)/certs
        install -d $(SOURCE)/core $(SOURCE)/net $(SOURCE)/util $(SOURCE)/fallbacks
        install -m755 ./prosody.install $(BIN)/prosody
@@ -26,9 +28,12 @@ install: prosody.install prosodyctl.install prosody.cfg.lua.install util/encodin
        install -m644 net/* $(SOURCE)/net
        install -m644 util/* $(SOURCE)/util
        install -m644 fallbacks/* $(SOURCE)/fallbacks
-       install -m644 plugins/* $(MODULES)
+       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 -m644 plugins/*.lua $(MODULES)
+       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
        $(MAKE) install -C util-src
@@ -68,7 +73,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